From 8cca1716611bb420f48bfd82a449aa7cf4cab05f Mon Sep 17 00:00:00 2001 From: "vda (OpenERP)" Date: Tue, 31 May 2011 16:55:45 +0530 Subject: [PATCH 001/167] [FIX] Calendar. bzr revid: vda@tinyerp.com-20110531112545-laa8rp2xxx9ympgk --- addons/base_calendar/controllers/main.py | 350 +---------------- .../base_calendar/static/src/js/calendar.js | 370 +++++++++++------- .../static/src/xml/base_calendar.xml | 10 +- 3 files changed, 233 insertions(+), 497 deletions(-) diff --git a/addons/base_calendar/controllers/main.py b/addons/base_calendar/controllers/main.py index a54d75c5b9b..41ede2bb7ab 100644 --- a/addons/base_calendar/controllers/main.py +++ b/addons/base_calendar/controllers/main.py @@ -1,356 +1,10 @@ from base.controllers.main import View -import openerpweb, time, math, re, datetime as DT, pytz - -COLOR_PALETTE = ['#f57900', '#cc0000', '#d400a8', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400', - '#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f', - '#ff8e00', '#ff0000', '#b0008c', '#9000ff', '#0078ff', '#00ff00', '#e6ff00', '#ffff00', - '#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900', ] - -_colorline = ['#%02x%02x%02x' % (25 + ((r + 10) % 11) * 23, 5 + ((g + 1) % 11) * 20, 25 + ((b + 4) % 11) * 23) for r in range(11) for g in range(11) for b in range(11) ] - -DT_SERVER_FORMATS = { - 'datetime' : '%Y-%m-%d %H:%M:%S', - 'date' : '%Y-%m-%d', - 'time' : '%H:%M:%S' -} - -DT_FORMAT_INFO = {'datetime' : ('%Y-%m-%d %H:%M:%S', DT.datetime, 0, 6), - 'date': ('%Y-%m-%d', DT.date, 0, 3), - 'time': ('%H:%M:%S', DT.time, 3, 6)} - -def choice_colors(n): - if n > len(COLOR_PALETTE): - return _colorline[0:-1:len(_colorline) / (n + 1)] - elif n: - return COLOR_PALETTE[:n] - return [] +import openerpweb class CalendarView(View): _cp_path = "/base_calendar/calendarview" - mode = 'month' - date_start = None - date_delay = None - date_stop = None - color_field = None - day_length = 8 - use_search = False - selected_day = None - date_format = '%Y-%m-%d' - info_fields = [] - fields = {} - events = [] - - colors = {} - color_values = [] - - remote_timezone = 'utc' - client_timezone = False - - calendar_fields = {} - concurrency_info = None - - ids = [] - model = '' - domain = [] - context = {} - @openerpweb.jsonrequest def load(self, req, model, view_id): fields_view = self.fields_view_get(req, model, view_id, 'calendar') - return {'fields_view':fields_view} - - def convert(self, event): - fields = [self.date_start] - if self.date_stop: - fields.append(self.date_stop) - - for fld in fields: - fld_type = self.fields[fld]['type'] - fmt = DT_SERVER_FORMATS[fld_type] - if event[fld] and fmt: - event[fld] = time.strptime(event[fld], fmt) - - # default start/stop time is 9:00 AM / 5:00 PM - if fld_type == 'date' and event[fld]: - ds = list(event[fld]) - if fld == self.date_start: - ds[3] = 9 - elif fld == self.date_stop: - ds[3] = 17 - event[fld] = tuple(ds) - - - @openerpweb.jsonrequest - def schedule_events(self, req, **kw): - self.model = kw['model'] - self.mode = kw.get('mode') or self.mode or 'month' - self.fields = kw['fields'] - self.color_field = kw.get('color_field') or self.color_field or None - self.colors = kw.get('colors') or {} - self.calendar_fields = kw['calendar_fields'] - self.info_fields = kw['info_fields'] - self.date_start = self.calendar_fields['date_start']['name'] - self.domain = kw.get('domain') or [] - - self.remote_timezone = req.session.remote_timezone - self.client_timezone = req.session.client_timezone - - if self.calendar_fields.get('date_stop'): - self.date_stop = self.calendar_fields['date_stop']['name'] - - if self.calendar_fields.get('date_delay'): - self.date_delay = self.calendar_fields['date_delay']['name'] - - model = req.session.model(self.model) - event_ids = model.search(self.domain) - - self.events = model.read(event_ids, self.fields.keys()) - result = [] - self.date_format = req.session._lang and req.session._lang['date_format'] - - if self.color_field: - for evt in self.events: - key = evt[self.color_field] - name = key - value = key - if isinstance(key, list): # M2O, XMLRPC returns List instead of Tuple - name = key[0] - value = key[-1] - evt[self.color_field] = key = key[-1] - if isinstance(key, tuple): # M2O - value, name = key - self.colors[key] = (name, value, None) - - colors = choice_colors(len(self.colors)) - for i, (key, value) in enumerate(self.colors.items()): - self.colors[key] = [value[0], value[1], colors[i]] - - for evt in self.events: - self.convert(evt) - a = self.get_event_widget(evt) - result.append(a) - - return {'result':result,'sidebar':self.colors} - - def parsedatetime(self, string): - - kind = 'datetime' - - if '-' in string and ':' in string: - kind = 'datetime' - elif '-' in string: - kind = 'date' - elif ':' in string: - kind = 'time' - - fmt, obj, i, j = DT_FORMAT_INFO[kind] - return obj(*time.strptime(string, fmt)[i:j]) - - def parse_datetime(self, value, kind="datetime", as_timetuple=False): - server_format = DT_SERVER_FORMATS[kind] - local_format = self.date_format - if not value: - return False - - if isinstance(value, (time.struct_time, tuple)): - value = time.strftime(local_format, value) - - try: - value = time.strptime(value, local_format) - except ValueError: - try: - # might be in server format already (e.g. filter domain) - value = time.strptime(value, server_format) - except ValueError: - try: - dt = list(time.localtime()) - dt[2] = int(value) - value = tuple(dt) - except: - return False - - if kind == "datetime": - try: - value = self.tz_convert(value, 'parse') - except Exception,e: - print "*******************Error in timezone parsing *********",e - - if as_timetuple: - return value - - return time.strftime(server_format, value) - - - @openerpweb.jsonrequest - def edit_events(self, req,**kw): - data = {} - ds = self.parsedatetime(kw['start_date']) - de = self.parsedatetime(kw['end_date']) - data[kw['calendar_fields']['date_start']['name']] = self.parse_datetime(ds.timetuple()) - - if 'date_stop' in kw['calendar_fields']: - data[kw['calendar_fields']['date_stop']['name']] = self.parse_datetime(de.timetuple()) - elif 'date_delay' in kw['calendar_fields']: - day_length = kw['calendar_fields']['day_length'] - - tds = time.mktime(ds.timetuple()) - tde = time.mktime(de.timetuple()) - - n = (tde - tds) / (60 * 60) - - if n > day_length: - d = math.floor(n / 24) - h = n % 24 - - n = d * day_length + h - - data[kw['calendar_fields']['date_delay']['name']] = n - error = None - try: - req.session.model(kw['model']).write([int(kw['id'])], data) - except Exception, e: - error = e - return error - - def tz_convert(self, struct_time, action): - # if no client timezone is configured, consider the client is in the same - # timezone as the server - lzone = pytz.timezone(self.client_timezone or self.remote_timezone) - szone = pytz.timezone(self.remote_timezone) - dt = DT.datetime.fromtimestamp(time.mktime(struct_time)) - - if action == 'parse': - fromzone = lzone - tozone = szone - elif action == 'format': - fromzone = szone - tozone = lzone - else: - raise Exception("_tz_convert action should be 'parse' or 'format'. Not '%s'" % (action, )) - - localized_original_datetime = fromzone.localize(dt, is_dst=True) - destination_datetime = localized_original_datetime.astimezone(tozone) - return destination_datetime.timetuple() - - def format_datetime(self, value, kind="datetime", as_timetuple=False): - """Convert date value to the local datetime considering timezone info. - - @param value: the date value - @param kind: type of the date value (date, time or datetime) - @param as_timetuple: return timetuple - - @type value: basestring or time.time_tuple) - - @return: string or timetuple - """ - - server_format = DT_SERVER_FORMATS[kind] - local_format = self.date_format - - if not value: - return '' - - if isinstance(value, (time.struct_time, tuple)): - value = time.strftime(server_format, value) - - if isinstance(value, DT.datetime): - value = value - try: - value = DT.datetime.strptime(value[:10], server_format) - return value.strftime(local_format) - except: - return '' - - value = value.strip() - - # remove trailing miliseconds - value = re.sub("(.*?)(\s+\d{2}:\d{2}:\d{2})(\.\d+)?$", "\g<1>\g<2>", value) - - # add time part in value if missing - if kind == 'datetime' and not re.search('\s+\d{2}:\d{2}:\d{2}?$', value): - value += ' 00:00:00' - - # remove time part from value - elif kind == 'date': - value = re.sub('\s+\d{2}:\d{2}:\d{2}(\.\d+)?$', '', value) - - value = time.strptime(value, server_format) - - if kind == "datetime": - try: - value = self.tz_convert(value, 'format') - except Exception, e: - print "\n\n\n************ Error in timezone formatting", e - - if as_timetuple: - return value - - return time.strftime(local_format, value) - - def get_event_widget(self, event): - title = '' # the title - description = [] # the description - - if self.info_fields: - - f = self.info_fields[0] - s = event[f] - - if isinstance(s, (tuple, list)): s = s[-1] - - title = s - for f in self.info_fields[1:]: - s = event[f] - if isinstance(s, (tuple, list)): - s = s[-1] - if s: - description.append(str(s)) - - starts = event.get(self.date_start) - ends = event.get(self.date_delay) or 1.0 - span = 0 - - if starts and ends: - - n = 0 - h = ends - - if ends == self.day_length: - span = 1 - - elif ends > self.day_length: - n = ends / self.day_length - h = ends % self.day_length - - n = int(math.floor(n)) - - if h > 0: - span = n + 1 - else: - span = n - ends = time.localtime(time.mktime(starts) + (h * 60 * 60) + (n * 24 * 60 * 60)) - - if starts and self.date_stop: - - ends = event.get(self.date_stop) - if not ends: - ends = time.localtime(time.mktime(starts) + 60 * 60) - - tds = time.mktime(starts) - tde = time.mktime(ends) - - if tds >= tde: - tde = tds + 60 * 60 - ends = time.localtime(tde) - - n = (tde - tds) / (60 * 60) - - if n >= self.day_length: - span = math.ceil(n / 24) - - starts = self.format_datetime(starts, "datetime", True) - ends = self.format_datetime(ends, "datetime", True) - title = title.strip() - description = ', '.join(description).strip() - return {'id': event['id'], 'start_date': str(DT.datetime(*starts[:6])), 'end_date': str(DT.datetime(*ends[:6])), 'text': title, 'title': description, 'color': self.colors[event[self.color_field]][-1]} + return {'fields_view': fields_view} diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js index 96a7fad8178..5e6d52fc93a 100644 --- a/addons/base_calendar/static/src/js/calendar.js +++ b/addons/base_calendar/static/src/js/calendar.js @@ -11,14 +11,13 @@ openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ this._super(session, element_id); this.view_manager = view_manager; this.dataset = dataset; - this.dataset_index = 0; this.model = dataset.model; this.view_id = view_id; this.fields_view = {}; this.widgets = {}; this.widgets_counter = 0; this.fields = this.dataset.fields ? this.dataset.fields: {}; - this.datarecord = {}; + this.ids = this.dataset.ids; this.name = ""; this.date_start = ""; this.date_delay = ""; @@ -35,23 +34,22 @@ openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ start: function() { this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); }, - on_loaded: function(result) { - var self = this; - var params = {}; - this.fields_view = result.fields_view; - this.name = this.fields_view.name || this.fields_view.arch.attrs.string; + on_loaded: function(data) { + + this.fields_view = data.fields_view; + this.name = this.fields_view.name || this.fields_view.arch.attrs.string; this.view_id = this.fields_view.view_id; - - this.date_start = this.fields_view.arch.attrs.date_start; + + this.date_start = this.fields_view.arch.attrs.date_start; this.date_delay = this.fields_view.arch.attrs.date_delay; this.date_stop = this.fields_view.arch.attrs.date_stop; - - this.colors = this.fields_view.arch.attrs.colors; + + this.colors = this.fields_view.arch.attrs.colors; this.day_length = this.fields_view.arch.attrs.day_length || 8; this.color_field = this.fields_view.arch.attrs.color; this.fields = this.fields_view.fields; - - //* Calendar Fields * + + //* Calendar Fields * this.calendar_fields['date_start'] = {'name': this.date_start, 'kind': this.fields[this.date_start]['type']}; if(this.date_delay) @@ -59,121 +57,181 @@ openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ if(this.date_stop) this.calendar_fields['date_stop'] = {'name': this.date_stop, 'kind': this.fields[this.date_stop]['type']}; - - this.calendar_fields['day_length'] = this.day_length; - //* ------- * - for(var fld=0;fld',{'width':'100%','cellspacing': 0, 'cellpadding': 0, 'id':'cal-sidebar-option'}) - ) - for(s in sidebar) { - jQuery('#cal-sidebar-option').append( - jQuery('').append( - jQuery('').append( - jQuery('
') - .append( - jQuery('', - { - 'type': 'checkbox', - 'id':sidebar[s][0], - 'value':sidebar[s][0] - }).bind('click',function(){ - self.reload_scheduler() - }), - sidebar[s][1] - ) - .css('background-color',sidebar[s][sidebar[s].length-1]) - ) - ) - ) - } - }, - - convert_date_format: function(start_date, end_date) { - var params = {}; - params['start_date'] = start_date.getFullYear() +'-' + start_date.getMonth()+'-' + start_date.getDate()+' '+start_date.getHours()+':'+start_date.getMinutes()+':'+start_date.getSeconds(); - if(end_date) { - params['end_date'] = end_date.getFullYear() +'-' + end_date.getMonth()+'-' + end_date.getDate()+' '+end_date.getHours()+':'+end_date.getMinutes()+':'+end_date.getSeconds(); - } - return params; - }, - - edit_event: function(evt_id, evt_object) { - var dates = this.convert_date_format(evt_object.start_date, evt_object.end_date); - this.rpc( - '/base_calendar/calendarview/edit_events', - { - 'start_date': dates.start_date, - 'end_date': dates.end_date, - 'id': evt_id, - 'model': this.model, - 'info_fields': this.info_fields, - 'fields': this.fields, - 'calendar_fields': this.calendar_fields - } - ); - }, - - mini_calendar: function() { + + //To parse Events we have to convert date Format + var res_events = []; + for(var e=0;e this.day_length) { + n = end / this.day_length; + h = end % this.day_length; + n = parseInt(Math.floor(n)); + + if(h > 0) + span = n + 1 + else + span = n + } + var end_date = openerp.base.parse_datetime(start); + end = end_date.add({hours: h, minutes: n}) + } + if(start && this.date_stop) { + var tds = start = openerp.base.parse_datetime(start); + var tde = ends = openerp.base.parse_datetime(event[this.date_stop]); + if(event[this.date_stop] == undefined) { + if(tds) { + end = (tds.getOrdinalNumber() + 60 * 60) + } + } + + if(tds && tde) { + //time.mktime equivalent + tds = (tds.getOrdinalNumber() / 1e3 >> 0) - (tds.getOrdinalNumber() < 0); + tde = (tde.getOrdinalNumber() / 1e3 >> 0) - (tde.getOrdinalNumber() < 0); + + } + if(tds >= tde) { + tde = tds + 60 * 60; + } + + n = (tde - tds) / (60 * 60); + if (n >= this.day_length) { + span = Math.ceil(n / 24); + } + } + + return { + 'start_date': start.toString('yyyy-MM-dd HH:mm:ss'), + 'end_date': end.toString('yyyy-MM-dd HH:mm:ss'), + 'text': res_text, + 'id': event['id'], + 'title': res_description.join() + } + }, + + mini_calendar: function() { if(scheduler.isCalendarVisible()) { scheduler.destroyCalendar(); @@ -189,11 +247,22 @@ openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ }); } }, - - reload_scheduler: function() { -// self.color_field - console.log('Reload Scheduler>>>') - }, + + do_search: function(domains, contexts, groupbys) { + var self = this; + this.rpc('/base/session/eval_domain_and_context', { + domains: domains, + contexts: contexts, + group_by_seq: groupbys + }, function (results) { + // TODO: handle non-empty results.group_by with read_group + self.dataset.context = self.context = results.context; + self.dataset.domain = self.domain = results.domain; + self.dataset.read_slice(self.fields, 0, self.limit,function(events){ + self.schedule_events(events) + }); + }); + }, do_show: function () { this.$element.show(); @@ -201,23 +270,42 @@ openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ do_hide: function () { this.$element.hide(); + }, + + popup_event: function(event_id) { + var action_manager = this.view_manager.session.action_manager; + + var action = { + "res_model": this.dataset.model, + "res_id": event_id, + "views":[[false,"form"]], + "type":"ir.actions.act_window", + "view_type":"form", + "view_mode":"form" + } + + action.flags = { + search_view: false, + sidebar : false, + views_switcher : false, + action_buttons : false, + pager: false + } + var element_id = _.uniqueId("act_window_dialog"); + var dialog = jQuery('
', { + 'id': element_id + }).dialog({ + modal: true, + width: 'auto', + height: 'auto' + }); + + var action_manager = new openerp.base.ActionManager(this.session, element_id); + action_manager.start(); + action_manager.do_action(action); } }); -//openerp.base.Action = openerp.base.Action.extend({ -// do_action_window: function(action) { -// this._super.apply(this,arguments); -// for(var i = 0; i < action.views.length; i++) { -// if(action.views[i][1] == "calendar") { -// this.calendar_id = action.views[i][0]; -// break; -// } -// } -// // IF there is a view calender -// // if(this.calendar_id -// }, -//}); - }; // DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner')) diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/base_calendar/static/src/xml/base_calendar.xml index 02d67be05bb..59f77cbb0bc 100644 --- a/addons/base_calendar/static/src/xml/base_calendar.xml +++ b/addons/base_calendar/static/src/xml/base_calendar.xml @@ -1,15 +1,9 @@ \ No newline at end of file From 4aa02596ff7d80fa144328491535aab1cb4d4311 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 11 Jul 2011 11:07:32 +0530 Subject: [PATCH 034/167] [IMP]account,account_sequence,base_contact,document,document_ics,l10n_br,l10n_cr,l10n_fr,l10n_ma,l10n_uk:Improvement is Done bzr revid: mma@tinyerp.com-20110711053732-83swt3grb29ayqez --- addons/account/account_installer.xml | 3 ++- addons/account/configurable_account_chart.xml | 3 ++- addons/account_sequence/account_sequence_installer_view.xml | 4 ++-- addons/base_contact/base_contact_installer_view.xml | 2 +- .../base_report_designer/base_report_designer_installer.xml | 3 ++- addons/document/wizard/document_configuration_view.xml | 2 +- addons/document_ics/document_ics_config_wizard.xml | 2 +- addons/l10n_br/data/l10n_br_account_chart_template.xml | 4 ++-- addons/l10n_cr/l10n_wizard.xml | 3 ++- addons/l10n_fr/l10n_fr_wizard.xml | 3 ++- addons/l10n_ma/l10n_ma_wizard.xml | 3 ++- addons/l10n_uk/l10n_uk_wizard.xml | 4 ++-- 12 files changed, 21 insertions(+), 15 deletions(-) diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index dd106e75afb..71633cc91f3 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -81,7 +81,8 @@ 3 - special + normal + open diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index fbae77349af..72386c839c1 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -617,7 +617,8 @@ Generate Chart of Accounts from a Chart Template - special + normal + open diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml index b39521d3c01..2af22bb01ae 100644 --- a/addons/account_sequence/account_sequence_installer_view.xml +++ b/addons/account_sequence/account_sequence_installer_view.xml @@ -51,8 +51,8 @@ 3 - special - skip + normal + open diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml index 981af67c60d..03216d49e94 100644 --- a/addons/base_contact/base_contact_installer_view.xml +++ b/addons/base_contact/base_contact_installer_view.xml @@ -54,7 +54,7 @@ 3 skip - special + normal diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index 0afee6233ef..6ef1ea11326 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -58,7 +58,8 @@ 3 - special + normal + open diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index c2bf3245afb..1fd15d1b381 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -51,7 +51,7 @@ - special + normal skip diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml index efa232a0a0d..6cd9199bfc3 100644 --- a/addons/document_ics/document_ics_config_wizard.xml +++ b/addons/document_ics/document_ics_config_wizard.xml @@ -56,7 +56,7 @@ - special + normal skip diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml index 819c4a8456a..548f7ff1341 100644 --- a/addons/l10n_br/data/l10n_br_account_chart_template.xml +++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml @@ -18,8 +18,8 @@ Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - open - special + skip + normal diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml index 26a82eb22ce..ceffba6a9d8 100644 --- a/addons/l10n_cr/l10n_wizard.xml +++ b/addons/l10n_cr/l10n_wizard.xml @@ -4,7 +4,8 @@ - special + normal + skip diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml index 0e97d868a52..97a12a661cf 100644 --- a/addons/l10n_fr/l10n_fr_wizard.xml +++ b/addons/l10n_fr/l10n_fr_wizard.xml @@ -4,7 +4,8 @@ - special + normal + skip diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml index a59a2e9ca83..2daebf030f4 100644 --- a/addons/l10n_ma/l10n_ma_wizard.xml +++ b/addons/l10n_ma/l10n_ma_wizard.xml @@ -4,7 +4,8 @@ - special + normal + skip diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml index e00fbd67add..66591f9d8b7 100644 --- a/addons/l10n_uk/l10n_uk_wizard.xml +++ b/addons/l10n_uk/l10n_uk_wizard.xml @@ -7,8 +7,8 @@ Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - open - special + skip + normal From 9d4dcb1f77a397bfd970626425b86d63b3d2fb8a Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 11 Jul 2011 12:40:16 +0530 Subject: [PATCH 035/167] [IMP] improve code. bzr revid: ysa@tinyerp.com-20110711071016-w743le30aujzc80g --- addons/base_export/controllers/main.py | 6 +-- .../base_export/static/src/js/base_export.js | 4 +- .../static/src/xml/base_export.xml | 41 +++++++++---------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index 5e0d5155a1e..6a261c826bf 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -19,7 +19,7 @@ class Export(View): for key, value in fields.items(): record = {} - id = prefix + (prefix and '/' or '') + key + id = prefix + (prefix and '_'or '') + key nm = name + (name and '/' or '') + value['string'] levels = nm.split('/') levels > 1 and levels.remove(levels[0]) or [] @@ -39,7 +39,7 @@ class Export(View): cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) children = [] for j, fld in enumerate(cfields_order): - cid = id + '/' + fld + cid = id + '_' + fld cid = cid.replace(' ', '_') children.append(cid) record['children'] = children or [] @@ -50,7 +50,7 @@ class Export(View): cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) children = [] for j, fld in enumerate(cfields_order): - cid = id + '/' + fld + cid = id + '_' + fld cid = cid.replace(' ', '_') children.append(cid) record['children'] = children or [] diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 8b91529f85e..b1dcd42d2d3 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -28,8 +28,7 @@ openerp.base_export.Export = openerp.base.Controller.extend({ on_click: function(id, result) { var self = this - this.field_id = id.split("@"); - this.field_id = self.field_id[1]; + this.field_id = id.split("@")[1]; var model = '' var prefix = '' var name = '' @@ -53,7 +52,6 @@ openerp.base_export.Export = openerp.base.Controller.extend({ var self = this; $('tr #treerow_' + self.field_id).after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); jQuery($.find('img[id ^= parentimg]')).click(function(){ - self.field_id = this.id self.on_click(this.id, result); }); diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index a104bc853a5..d094eb1a3aa 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -94,31 +94,28 @@ - - - - - - - - - - - -
&nbsp; - - - - - - - -
+ + + + + + + + +
&nbsp; + + + + + + + +
- - + + \ No newline at end of file From af3773c0f5590ae02e2a0d28cf76294bf9be33e8 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 11 Jul 2011 12:47:53 +0530 Subject: [PATCH 036/167] [IMP]l10n_be,l10n_es,l10n_lu : Improvement is Done bzr revid: mma@tinyerp.com-20110711071753-jmd5f3sg21y5vqah --- addons/l10n_be/l10n_be_wizard.xml | 2 +- addons/l10n_es/l10n_es_wizard.xml | 2 +- addons/l10n_lu/l10n_lu_wizard.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml index 5473499d971..f97cba250f4 100644 --- a/addons/l10n_be/l10n_be_wizard.xml +++ b/addons/l10n_be/l10n_be_wizard.xml @@ -5,7 +5,7 @@ - special + normal diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml index d0f89dfc87a..116ef691f45 100644 --- a/addons/l10n_es/l10n_es_wizard.xml +++ b/addons/l10n_es/l10n_es_wizard.xml @@ -4,7 +4,7 @@ - special + normal diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml index bbe7949af49..e647a180279 100644 --- a/addons/l10n_lu/l10n_lu_wizard.xml +++ b/addons/l10n_lu/l10n_lu_wizard.xml @@ -4,7 +4,7 @@ - special + normal From adbeaf08d63dd3b0bfc8074d5e30db4c7dfb9311 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 11 Jul 2011 14:42:29 +0530 Subject: [PATCH 037/167] [IMP]base_contact,l10n_be,l10n_br,l10n_cr,l10n_fr,l10n_ma,l10n_uk,l10n_es,l10n_lu : Improvement is Done as per suggestion bzr revid: mma@tinyerp.com-20110711091229-5neacsh6i7sapgb4 --- addons/base_contact/base_contact_installer_view.xml | 2 +- addons/l10n_be/l10n_be_wizard.xml | 1 + addons/l10n_br/data/l10n_br_account_chart_template.xml | 2 +- addons/l10n_cr/l10n_wizard.xml | 2 +- addons/l10n_es/l10n_es_wizard.xml | 1 + addons/l10n_fr/l10n_fr_wizard.xml | 2 +- addons/l10n_lu/l10n_lu_wizard.xml | 1 + addons/l10n_ma/l10n_ma_wizard.xml | 2 +- addons/l10n_uk/l10n_uk_wizard.xml | 2 +- 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml index 03216d49e94..66c486a0514 100644 --- a/addons/base_contact/base_contact_installer_view.xml +++ b/addons/base_contact/base_contact_installer_view.xml @@ -53,7 +53,7 @@ 3 - skip + open normal diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml index f97cba250f4..57f1ca0588f 100644 --- a/addons/l10n_be/l10n_be_wizard.xml +++ b/addons/l10n_be/l10n_be_wizard.xml @@ -6,6 +6,7 @@ normal + open diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml index 548f7ff1341..54f61af52de 100644 --- a/addons/l10n_br/data/l10n_br_account_chart_template.xml +++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml @@ -18,7 +18,7 @@ Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - skip + open normal diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml index ceffba6a9d8..d413dbe829b 100644 --- a/addons/l10n_cr/l10n_wizard.xml +++ b/addons/l10n_cr/l10n_wizard.xml @@ -5,7 +5,7 @@ normal - skip + open diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml index 116ef691f45..5586198d844 100644 --- a/addons/l10n_es/l10n_es_wizard.xml +++ b/addons/l10n_es/l10n_es_wizard.xml @@ -5,6 +5,7 @@ normal + open diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml index 97a12a661cf..712bd36f103 100644 --- a/addons/l10n_fr/l10n_fr_wizard.xml +++ b/addons/l10n_fr/l10n_fr_wizard.xml @@ -5,7 +5,7 @@ normal - skip + open diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml index e647a180279..abf74d7b0a8 100644 --- a/addons/l10n_lu/l10n_lu_wizard.xml +++ b/addons/l10n_lu/l10n_lu_wizard.xml @@ -5,6 +5,7 @@ normal + open diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml index 2daebf030f4..c47092321b1 100644 --- a/addons/l10n_ma/l10n_ma_wizard.xml +++ b/addons/l10n_ma/l10n_ma_wizard.xml @@ -5,7 +5,7 @@ normal - skip + open diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml index 66591f9d8b7..8706db11ecf 100644 --- a/addons/l10n_uk/l10n_uk_wizard.xml +++ b/addons/l10n_uk/l10n_uk_wizard.xml @@ -7,7 +7,7 @@ Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - skip + open normal From a692a00f097390f1977fdeb8d68bdc647abaf022 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Mon, 11 Jul 2011 17:10:03 +0530 Subject: [PATCH 038/167] [FIX]jquery id selector problem when id has slash. bzr revid: kch@tinyerp.com-20110711114003-ava3hz0n2syvr3o8 --- addons/base_export/controllers/main.py | 6 +++--- addons/base_export/static/src/js/base_export.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index 6a261c826bf..eb475e59a21 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -19,7 +19,7 @@ class Export(View): for key, value in fields.items(): record = {} - id = prefix + (prefix and '_'or '') + key + id = prefix + (prefix and '/'or '') + key nm = name + (name and '/' or '') + value['string'] levels = nm.split('/') levels > 1 and levels.remove(levels[0]) or [] @@ -39,7 +39,7 @@ class Export(View): cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) children = [] for j, fld in enumerate(cfields_order): - cid = id + '_' + fld + cid = id + '/' + fld cid = cid.replace(' ', '_') children.append(cid) record['children'] = children or [] @@ -50,7 +50,7 @@ class Export(View): cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) children = [] for j, fld in enumerate(cfields_order): - cid = id + '_' + fld + cid = id + '/' + fld cid = cid.replace(' ', '_') children.append(cid) record['children'] = children or [] diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index b1dcd42d2d3..9b240421bda 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -50,7 +50,7 @@ openerp.base_export.Export = openerp.base.Controller.extend({ on_show_data: function(result) { var self = this; - $('tr #treerow_' + self.field_id).after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + $("tr[id='treerow_" + self.field_id + "']").after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); jQuery($.find('img[id ^= parentimg]')).click(function(){ self.on_click(this.id, result); From a5fb5a10c17ddc06fe889fe793ef0a195a51c921 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 11 Jul 2011 17:15:37 +0530 Subject: [PATCH 039/167] [IMP] add add_field method and bind double click method of field. bzr revid: ysa@tinyerp.com-20110711114537-843beu7m00s225m7 --- .../static/src/css/base_export.css | 2 +- .../base_export/static/src/js/base_export.js | 28 +++++++++++++++++-- .../static/src/xml/base_export.xml | 21 +++----------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base_export/static/src/css/base_export.css index 4421c0e4fa5..61ddb47451b 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base_export/static/src/css/base_export.css @@ -4,7 +4,7 @@ .row:hover { background-color: #F3F3F3; - color: #0000FF; + color : #4F4F4F; } .row.selected{ diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 9b240421bda..0dd98efc952 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -19,8 +19,20 @@ openerp.base_export.Export = openerp.base.Controller.extend({ title: "Export Data", modal: true, width: '50%', - height: 'auto' + height: 'auto', + buttons : { + "Close" : function() { + _export.dialog('destroy'); + }, + "Export To File" : function() { + _export.dialog('destroy'); + } + } }).html(QWeb.render('ExportTreeView', {'fields': result})) + + jQuery(_export).find('[id^=export]').dblclick(function(){ + self.add_field(this.id, this.text) + }); jQuery(_export).find('[id^=parentimg]').click(function(){ self.on_click(this.id, result); }); @@ -28,7 +40,7 @@ openerp.base_export.Export = openerp.base.Controller.extend({ on_click: function(id, result) { var self = this - this.field_id = id.split("@")[1]; + this.field_id = id.split("-")[1]; var model = '' var prefix = '' var name = '' @@ -53,8 +65,18 @@ openerp.base_export.Export = openerp.base.Controller.extend({ $("tr[id='treerow_" + self.field_id + "']").after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); jQuery($.find('img[id ^= parentimg]')).click(function(){ self.on_click(this.id, result); - }); + jQuery($.find('[id^=export]')).dblclick(function(){ + self.add_field(this.id, this.text) + }); + }, + + add_field: function(id, string) { + var field_list = $('#fields_list') + field_id = id.split("-")[1]; + if ( !$("#fields_list option[value='" + field_id + "']").length){ + field_list.append( new Option(string, field_id)); + } }, }); diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index d094eb1a3aa..c0bcd72508e 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -55,7 +55,7 @@ @@ -71,25 +71,12 @@
- +
- + - - - - - - - -
- - -
- - @@ -104,11 +91,11 @@ - + - + From 28a4cff1a1e41264bce79803c457add9962c3a61 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 12 Jul 2011 10:35:39 +0530 Subject: [PATCH 040/167] Improve code. bzr revid: ysa@tinyerp.com-20110712050539-17fsv9d6angr7f97 --- .../base_export/static/src/js/base_export.js | 30 ++++++++----------- .../static/src/xml/base_export.xml | 2 +- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 0dd98efc952..944dbdb4fb9 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -15,27 +15,21 @@ openerp.base_export.Export = openerp.base.Controller.extend({ on_loaded: function(result) { var self = this; var element_id = _.uniqueId("act_window_dialog"); - var _export = $('
', {id: element_id}).dialog({ + this._export = $('
', {id: element_id}).dialog({ title: "Export Data", modal: true, width: '50%', height: 'auto', buttons : { "Close" : function() { - _export.dialog('destroy'); + this._export.dialog('destroy'); }, "Export To File" : function() { - _export.dialog('destroy'); + this._export.dialog('destroy'); } } - }).html(QWeb.render('ExportTreeView', {'fields': result})) - - jQuery(_export).find('[id^=export]').dblclick(function(){ - self.add_field(this.id, this.text) - }); - jQuery(_export).find('[id^=parentimg]').click(function(){ - self.on_click(this.id, result); - }); + }).html(QWeb.render('ExportTreeView')) + self.on_show_data(result) }, on_click: function(id, result) { @@ -52,17 +46,19 @@ openerp.base_export.Export = openerp.base.Controller.extend({ } } if (model){ - self.get_data(model, prefix, name) + this.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : this.field_id, "name": name}, this.on_show_data, {}); } }, - get_data: function(model, prefix, name) { - this.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : this.field_id, "name": name}, this.on_show_data, {}); - }, - on_show_data: function(result) { var self = this; - $("tr[id='treerow_" + self.field_id + "']").after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + var current_tr = $("tr[id='treerow_" + self.field_id + "']"); + if (current_tr.length >= 1){ + current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + } + else{ + jQuery(self._export).find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + } jQuery($.find('img[id ^= parentimg]')).click(function(){ self.on_click(this.id, result); }); diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index c0bcd72508e..5f2ab00012d 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -44,7 +44,7 @@ - +
From d4575451a439f27a84cceeb3fe14035749d8c57c Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 12 Jul 2011 12:44:22 +0530 Subject: [PATCH 041/167] [IMP] improve tree structure in export. bzr revid: ysa@tinyerp.com-20110712071422-wq5bal1pbepyrrdq --- .../base_export/static/src/js/base_export.js | 52 +++++++++++++++++-- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 944dbdb4fb9..df5b3680f0d 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -38,22 +38,45 @@ openerp.base_export.Export = openerp.base.Controller.extend({ var model = '' var prefix = '' var name = '' + var is_loaded = 0; for (var record in result){ if(result[record]['id'] == this.field_id){ model = result[record]['params']['model'] prefix = result[record]['params']['prefix'] name = result[record]['params']['name'] + if ( (result[record]['children']).length >= 1){ + $(result[record]['children']).each (function(e, childid) { + if ($("tr[id='treerow_" + childid +"']").length > 0) { + if ($("tr[id='treerow_" + childid +"']").is(':hidden')) { + is_loaded = -1; + } else { + is_loaded++; + } + } + }); + if (is_loaded == 0) { + if ($("tr[id='treerow_" + this.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { + if (model){ + this.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : this.field_id, "name": name}, function (result) { + self.on_show_data(result, true); + }); + } + } + } else if (is_loaded > 0) { + self.showcontent(this.field_id, true); + } else { + self.showcontent(this.field_id, false); + } + } } } - if (model){ - this.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : this.field_id, "name": name}, this.on_show_data, {}); - } }, - on_show_data: function(result) { + on_show_data: function(result, flag) { var self = this; var current_tr = $("tr[id='treerow_" + self.field_id + "']"); if (current_tr.length >= 1){ + current_tr.find('img').attr('src','/base/static/src/img/collapse.gif'); current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } else{ @@ -67,6 +90,27 @@ openerp.base_export.Export = openerp.base.Controller.extend({ }); }, + + // show & hide the contents + showcontent: function (id, flag) { + var first_child = $("tr[id='treerow_" + id + "']").find('img') + if (flag) { + first_child.attr('src', '/base/static/src/img/expand.gif'); + } + else { + first_child.attr('src', '/base/static/src/img/collapse.gif'); + } + var child_field = $("tr[id^='treerow_" + id +"/']") + for (var i = 0; i < child_field.length; i++) { + if (flag) { + $(child_field[i]).hide(); + } + else { + $(child_field[i]).show(); + } + } + }, + add_field: function(id, string) { var field_list = $('#fields_list') field_id = id.split("-")[1]; From 5ad4baccf6f78aea0eac29b9d85af3f869107397 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 12 Jul 2011 15:51:18 +0530 Subject: [PATCH 042/167] [IMP] bind click event of add button and define add_field method.. bzr revid: ysa@tinyerp.com-20110712102118-zj85dz9nved836iv --- .../base_export/static/src/js/base_export.js | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index df5b3680f0d..342fffa711a 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -7,11 +7,15 @@ openerp.base_export.Export = openerp.base.Controller.extend({ this._super(session); this.dataset = dataset this.views = views + this.selected_field_id = ''; + this.selected_field_str = ''; }, + start: function() { this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_loaded); }, + on_loaded: function(result) { var self = this; var element_id = _.uniqueId("act_window_dialog"); @@ -22,14 +26,19 @@ openerp.base_export.Export = openerp.base.Controller.extend({ height: 'auto', buttons : { "Close" : function() { - this._export.dialog('destroy'); + self._export.dialog('destroy'); }, "Export To File" : function() { - this._export.dialog('destroy'); + self.get_fields(); } } }).html(QWeb.render('ExportTreeView')) self.on_show_data(result) + jQuery(this._export).find('#add_field').click(function(){ + if (self.selected_field_id && self.selected_field_str){ + self.add_field(self.selected_field_id, self.selected_field_str); + } + }); }, on_click: function(id, result) { @@ -85,12 +94,15 @@ openerp.base_export.Export = openerp.base.Controller.extend({ jQuery($.find('img[id ^= parentimg]')).click(function(){ self.on_click(this.id, result); }); - jQuery($.find('[id^=export]')).dblclick(function(){ + jQuery($.find('[id^=export-]')).dblclick(function(){ self.add_field(this.id, this.text) }); + jQuery($.find('[id^=export-]')).click(function(){ + self.selected_field_id = this.id; + self.selected_field_str = this.text; + }); }, - // show & hide the contents showcontent: function (id, flag) { var first_child = $("tr[id='treerow_" + id + "']").find('img') @@ -114,10 +126,23 @@ openerp.base_export.Export = openerp.base.Controller.extend({ add_field: function(id, string) { var field_list = $('#fields_list') field_id = id.split("-")[1]; - if ( !$("#fields_list option[value='" + field_id + "']").length){ + if ( $("#fields_list option[value='" + field_id + "']") && !$("#fields_list option[value='" + field_id + "']").length){ field_list.append( new Option(string, field_id)); } }, + + get_fields: function (){ + var export_field = []; + jQuery("#fields_list option").each(function(){ + export_field.push(jQuery(this).val()); + }); + if (! export_field.length){ + alert('Please select fields to export...'); + } + else { + this._export.dialog('destroy'); + } + }, }); }; From 2c1473cdad3e21c2945da203127552d7b036be3b Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 12 Jul 2011 18:42:21 +0530 Subject: [PATCH 043/167] [IMP] add mouseover event for be able to drag and drop field within a export list. bzr revid: ysa@tinyerp.com-20110712131221-wcxsfq0u5fovv088 --- addons/base_export/static/src/js/base_export.js | 10 ++++++++++ addons/base_export/static/src/xml/base_export.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 342fffa711a..158ecb03999 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -101,6 +101,16 @@ openerp.base_export.Export = openerp.base.Controller.extend({ self.selected_field_id = this.id; self.selected_field_str = this.text; }); + jQuery($.find('#fields_list')).mouseover(function(event){ + if(event.relatedTarget){ + if ('id' in event.relatedTarget.attributes && 'string' in event.relatedTarget.attributes){ + field_id = event.relatedTarget.attributes["id"]["value"] + if (field_id && field_id.split("-")[0] == 'export'){ + self.add_field(event.relatedTarget.attributes['id']["value"], event.relatedTarget.attributes["string"]["value"]); + } + } + } + }); }, // show & hide the contents diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index 5f2ab00012d..cebbb02d4d7 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -95,7 +95,7 @@ - + From b37a904b73c6b243f142d69c6c1b7ce50bac8bc9 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 13 Jul 2011 10:56:02 +0530 Subject: [PATCH 044/167] [IMP] implementation of dialogbox stop() method. bzr revid: ysa@tinyerp.com-20110713052602-qkuxt6sca9wktmtp --- addons/base_export/static/src/js/base_export.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 158ecb03999..8e5544c02dd 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -26,12 +26,14 @@ openerp.base_export.Export = openerp.base.Controller.extend({ height: 'auto', buttons : { "Close" : function() { + self.stop(); self._export.dialog('destroy'); }, "Export To File" : function() { self.get_fields(); } - } + }, + close: function(event, ui){ self.stop();}, }).html(QWeb.render('ExportTreeView')) self.on_show_data(result) jQuery(this._export).find('#add_field').click(function(){ @@ -153,6 +155,11 @@ openerp.base_export.Export = openerp.base.Controller.extend({ this._export.dialog('destroy'); } }, + + stop: function() { + jQuery(this._export).remove(); + }, + }); }; From 13e6ddd9849898f965493453bf9d2a2665a42310 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 13 Jul 2011 11:36:46 +0530 Subject: [PATCH 045/167] [IMP] bind click event of remove field and remove all field button, also remove field on selection box. bzr revid: ysa@tinyerp.com-20110713060646-d21a13gb90ii9ihl --- addons/base/static/src/js/chrome.js | 14 +++++++------- addons/base_export/static/src/js/base_export.js | 6 ++++++ addons/base_export/static/src/xml/base_export.xml | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index ebaf457daa2..20f952798e4 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -269,7 +269,7 @@ openerp.base.BasicController = Class.extend( /** @lends openerp.base.BasicContro /** * Generates an inherited class that replaces all the methods by null methods (methods * that does nothing and always return undefined). - * + * * @param {Class} claz * @param {dict} add Additional functions to override. * @return {Class} @@ -579,7 +579,7 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener element_post_prefix: false }, /** - * Controller registry, + * Controller registry, */ controller_registry: { }, @@ -676,14 +676,14 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({ /** * The name of the QWeb template that will be used for rendering. Must be * redefined in subclasses or the render() method can not be used. - * + * * @type string */ template: null, /** * The prefix used to generate an id automatically. Should be redefined in * subclasses. If it is not defined, a default identifier will be used. - * + * * @type string */ identifier_prefix: 'generic-identifier', @@ -741,7 +741,7 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({ /** * Set the parent of this component, also un-register the previous parent * if there was one. - * + * * @param {openerp.base.BaseWidget} parent The new parent. */ set_parent: function(parent) { @@ -756,7 +756,7 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({ /** * Render the widget. This.template must be defined. * The content of the current object is passed as context to the template. - * + * * @param {object} additional Additional context arguments to pass to the template. */ render: function (additional) { @@ -1135,7 +1135,7 @@ openerp.base.WebClient = openerp.base.Controller.extend({ on_logged: function() { this.action_manager = new openerp.base.ActionManager(this.session, "oe_app"); this.action_manager.start(); - + // if using saved actions, load the action and give it to action manager var parameters = jQuery.deparam(jQuery.param.querystring()); if(parameters["s_action"] != undefined) { diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 8e5544c02dd..28ac988fbe7 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -41,6 +41,12 @@ openerp.base_export.Export = openerp.base.Controller.extend({ self.add_field(self.selected_field_id, self.selected_field_str); } }); + jQuery(this._export).find('#remove_field').click(function(){ + jQuery(self._export).find("#fields_list option:selected").remove(); + }); + jQuery(this._export).find('#remove_all_field').click(function(){ + jQuery(self._export).find("#fields_list option").remove(); + }); }, on_click: function(id, result) { diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index cebbb02d4d7..e2a653e4465 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -60,12 +60,12 @@ - + - + From 4e76fff24895c7876d5c5be61cf4f5754e6f5219 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 13 Jul 2011 12:37:12 +0530 Subject: [PATCH 046/167] [FIX] Created separate functions for create, drop, backup, etc... bzr revid: noz@tinyerp.com-20110713070712-0b2uip0o0z7w4zc0 --- addons/base/static/src/js/chrome.js | 323 ++++++++++++++-------------- 1 file changed, 166 insertions(+), 157 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index a8afef55dbb..7db8f4bfa7f 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -927,177 +927,186 @@ openerp.base.Database = openerp.base.Controller.extend({ this.rpc("/base/session/get_lang_list", {}, function(result) { self.lang_list = result.lang_list; + self.do_db_create(); }); - this.$element.find('#db-create').click(function() { - self.db_string = "CREATE DATABASE"; - self.$option_id.html(QWeb.render("CreateDB", self)); - - $("form[name=create_db_form]").validate(); - - $("input[name=create_confirm_pwd]").rules("add", { - equalTo: 'input[name=create_admin_pwd]', - messages: { - required: "Password did not match !" - } - }); - - $("input[name=super_admin_pwd]").focus(); - - self.$option_id.find('form[name=create_db_form]').submit(function(ev) { - ev.preventDefault(); - - var super_admin_pwd = self.$option_id.find("input[name=super_admin_pwd]").val(); - var db = self.$option_id.find("input[name=db_name]").val(); - var demo_data = self.$option_id.find("input[name=demo_data]:checked"); - var db_lang = self.$option_id.find("select[name=db_lang]").val(); - var admin_pwd = self.$option_id.find("input[name=create_admin_pwd]").val(); - var confirm_pwd = self.$option_id.find("input[name=create_confirm_pwd]").val(); + this.$element.find('#db-create').click(this.do_db_create); + this.$element.find('#db-drop').click(this.do_db_drop); + this.$element.find('#db-backup').click(this.do_db_backup); + this.$element.find('#db-restore').click(this.do_db_restore); + this.$element.find('#db-change-password').click(this.do_change_password); + this.$element.find('#back-to-login').click(function() { + self.header = new openerp.base.Header(self.session, "oe_header"); + self.header.on_logout(); + }); + }, + + do_db_create: function() { + var self = this; + self.db_string = "CREATE DATABASE"; + self.$option_id.html(QWeb.render("CreateDB", self)); + + $("form[name=create_db_form]").validate(); + + $("input[name=create_confirm_pwd]").rules("add", { + equalTo: 'input[name=create_admin_pwd]', + messages: { + required: "Password did not match !" + } + }); + + $("input[name=super_admin_pwd]").focus(); + + self.$option_id.find('form[name=create_db_form]').submit(function(ev) { + ev.preventDefault(); + + var super_admin_pwd = self.$option_id.find("input[name=super_admin_pwd]").val(); + var db = self.$option_id.find("input[name=db_name]").val(); + var demo_data = self.$option_id.find("input[name=demo_data]:checked"); + var db_lang = self.$option_id.find("select[name=db_lang]").val(); + var admin_pwd = self.$option_id.find("input[name=create_admin_pwd]").val(); + var confirm_pwd = self.$option_id.find("input[name=create_confirm_pwd]").val(); - if (demo_data.length) - demo_data = 'True'; - else - demo_data = 'False'; - - self.rpc("/base/session/db_operation", { - 'flag': 'create', - 'super_admin_pwd': super_admin_pwd, - 'db': db, - 'demo_data': demo_data, - 'db_lang': db_lang, - 'admin_pwd': admin_pwd, - 'confirm_pwd': confirm_pwd - }, - function(result) { - if (result && !result.error) { - - } - }); - - }); - - - }); - - self.$element.find('#db-drop').click(function() { - self.db_string = "DROP DATABASE"; - self.$option_id.html(QWeb.render("DropDB", self)); - - $("form[name=drop_db_form]").validate(); - - self.$option_id.find('form[name=drop_db_form]').submit(function(ev) { - ev.preventDefault(); - - var db = self.$option_id.find("select[name=drop_db]").val(); - var password = self.$option_id.find("input[name=drop_pwd]").val(); - - if (confirm("Do you really want to delete the database: " + db + " ?")) { - self.rpc("/base/session/db_operation", {'flag': 'drop', 'db': db, 'password': password}, - function(result) { - if (result && !result.error) { - self.$option_id.find("select[name=drop_db] :selected").remove(); - self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); - } - }); - } - }); - }); - - self.$element.find('#db-backup').click(function() { - self.db_string = "BACKUP DATABASE"; - self.$option_id.html(QWeb.render("BackupDB", self)); - - $("form[name=backup_db_form]").validate(); - - self.$option_id.find('form[name=backup_db_form]').submit(function(ev) { - ev.preventDefault(); - - var db = self.$option_id.find("select[name=backup_db]").val(); - var password = self.$option_id.find("input[name=backup_pwd]").val(); - - self.rpc("/base/session/db_operation", {'flag': 'backup', 'db': db, 'password': password}, + if (demo_data.length) + demo_data = 'True'; + else + demo_data = 'False'; + + self.rpc("/base/session/db_operation", { + 'flag': 'create', + 'super_admin_pwd': super_admin_pwd, + 'db': db, + 'demo_data': demo_data, + 'db_lang': db_lang, + 'admin_pwd': admin_pwd, + 'confirm_pwd': confirm_pwd + }, function(result) { if (result && !result.error) { - self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'"); - } else if (result.error) { - self.notification.notify("Backup Database", result.error); + } - }); - }); + }); + }); + }, + + do_db_drop: function() { + var self = this; + self.db_string = "DROP DATABASE"; + self.$option_id.html(QWeb.render("DropDB", self)); + + $("form[name=drop_db_form]").validate(); + + self.$option_id.find('form[name=drop_db_form]').submit(function(ev) { + ev.preventDefault(); + + var db = self.$option_id.find("select[name=drop_db]").val(); + var password = self.$option_id.find("input[name=drop_pwd]").val(); + + if (confirm("Do you really want to delete the database: " + db + " ?")) { + self.rpc("/base/session/db_operation", {'flag': 'drop', 'db': db, 'password': password}, + function(result) { + if (result && !result.error) { + self.$option_id.find("select[name=drop_db] :selected").remove(); + self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); + } + }); + } }); - - self.$element.find('#db-restore').click(function() { - self.db_string = "RESTORE DATABASE"; - self.$option_id.html(QWeb.render("RestoreDB", self)); - - $("form[name=restore_db_form]").validate(); - - self.$option_id.find('form[name=restore_db_form]').submit(function(ev) { - ev.preventDefault(); - - var db = self.$option_id.find("input[name=restore_db]").val(); - var password = self.$option_id.find("input[name=restore_pwd]").val(); - var new_db = self.$option_id.find("input[name=new_db]").val(); - - self.rpc("/base/session/db_operation", {'flag': 'restore', 'db': db, 'password': password, 'new_db': new_db}, - function(result) { - if (result && !result.error) { - self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'"); - } else if (result.error) { - self.notification.notify("Restore Database", result.error); - } - }); - }); - }); - - self.$element.find('#db-change-password').click(function() { - self.db_string = "CHANGE DATABASE PASSWORD"; - self.$option_id.html(QWeb.render("Change_DB_Pwd", self)); - - $("form[name=change_pwd_form]").validate(); - - $("input[name=old_pwd]").rules("add", { - minlength: 1, - messages: { - required: "Please enter password !" - } - }); - $("input[name=new_pwd]").rules("add", { - minlength: 1, - messages: { - required: "Please enter password !" - } - }); - $("input[name=confirm_pwd]").rules("add", { - equalTo: 'input[name=new_pwd]', - messages: { - required: "Password did not match !" - } - }); - - $("input[name=old_pwd]").focus(); + }, + + do_db_backup: function() { + var self = this; + self.db_string = "BACKUP DATABASE"; + self.$option_id.html(QWeb.render("BackupDB", self)); + + $("form[name=backup_db_form]").validate(); + + self.$option_id.find('form[name=backup_db_form]').submit(function(ev) { + ev.preventDefault(); + + var db = self.$option_id.find("select[name=backup_db]").val(); + var password = self.$option_id.find("input[name=backup_pwd]").val(); - self.$option_id.find('form[name=change_pwd_form]').submit(function(ev) { - ev.preventDefault(); - - var old_pwd = self.$option_id.find("input[name=old_pwd]").val(); - var new_pwd = self.$option_id.find("input[name=new_pwd]").val(); - var confirm_pwd = self.$option_id.find("input[name=confirm_pwd]").val(); - - self.rpc("/base/session/db_operation", {'flag': 'change_password', 'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd}, + self.rpc("/base/session/db_operation", {'flag': 'backup', 'db': db, 'password': password}, + function(result) { + if (result && !result.error) { + self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'"); + } else if (result.error) { + self.notification.notify("Backup Database", result.error); + } + }); + }); + }, + + do_db_restore: function() { + var self = this; + self.db_string = "RESTORE DATABASE"; + self.$option_id.html(QWeb.render("RestoreDB", self)); + + $("form[name=restore_db_form]").validate(); + + self.$option_id.find('form[name=restore_db_form]').submit(function(ev) { + ev.preventDefault(); + + var db = self.$option_id.find("input[name=restore_db]").val(); + var password = self.$option_id.find("input[name=restore_pwd]").val(); + var new_db = self.$option_id.find("input[name=new_db]").val(); + + self.rpc("/base/session/db_operation", {'flag': 'restore', 'db': db, 'password': password, 'new_db': new_db}, + function(result) { + if (result && !result.error) { + self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'"); + } else if (result.error) { + self.notification.notify("Restore Database", result.error); + } + }); + }); + }, + + do_change_password: function() { + var self = this; + self.db_string = "CHANGE DATABASE PASSWORD"; + self.$option_id.html(QWeb.render("Change_DB_Pwd", self)); + + $("form[name=change_pwd_form]").validate(); + + $("input[name=old_pwd]").rules("add", { + minlength: 1, + messages: { + required: "Please enter password !" + } + }); + $("input[name=new_pwd]").rules("add", { + minlength: 1, + messages: { + required: "Please enter password !" + } + }); + $("input[name=confirm_pwd]").rules("add", { + equalTo: 'input[name=new_pwd]', + messages: { + required: "Password did not match !" + } + }); + + $("input[name=old_pwd]").focus(); + + self.$option_id.find('form[name=change_pwd_form]').submit(function(ev) { + ev.preventDefault(); + + var old_pwd = self.$option_id.find("input[name=old_pwd]").val(); + var new_pwd = self.$option_id.find("input[name=new_pwd]").val(); + var confirm_pwd = self.$option_id.find("input[name=confirm_pwd]").val(); + + self.rpc("/base/session/db_operation", {'flag': 'change_password', 'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd}, function(result) { if (result && !result.error) { self.notification.notify("Changed Password", "Password has been changed successfully"); } }); - }); - }); - - self.$element.find('#back-to-login').click(function() { - self.header = new openerp.base.Header(self.session, "oe_header"); - self.header.on_logout(); - }); + }); } + }); openerp.base.Login = openerp.base.Controller.extend({ From 3634daba44ba904eb0c42abccaf410c70f0ac383 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 13 Jul 2011 12:46:41 +0530 Subject: [PATCH 047/167] Improve code. bzr revid: ysa@tinyerp.com-20110713071641-1uwyq5feycks76ka --- addons/base_export/static/src/js/base_export.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 28ac988fbe7..32f20a39aa9 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -1,7 +1,7 @@ openerp.base_export = function(openerp) { QWeb.add_template('/base_export/static/src/xml/base_export.xml'); openerp.base.views.add('export', 'openerp.base_export.Export'); -openerp.base_export.Export = openerp.base.Controller.extend({ +openerp.base_export.Export = openerp.base.Dialog.extend({ init: function(session, dataset, views){ this._super(session); @@ -9,7 +9,6 @@ openerp.base_export.Export = openerp.base.Controller.extend({ this.views = views this.selected_field_id = ''; this.selected_field_str = ''; - }, start: function() { @@ -24,16 +23,16 @@ openerp.base_export.Export = openerp.base.Controller.extend({ modal: true, width: '50%', height: 'auto', + position: 'top', buttons : { "Close" : function() { - self.stop(); - self._export.dialog('destroy'); + self.close(); }, "Export To File" : function() { self.get_fields(); } }, - close: function(event, ui){ self.stop();}, + close: function(event, ui){ self.close();}, }).html(QWeb.render('ExportTreeView')) self.on_show_data(result) jQuery(this._export).find('#add_field').click(function(){ @@ -158,12 +157,13 @@ openerp.base_export.Export = openerp.base.Controller.extend({ alert('Please select fields to export...'); } else { - this._export.dialog('destroy'); + this._export.dialog('close'); } }, - stop: function() { + close: function() { jQuery(this._export).remove(); + this._export.dialog('close'); }, }); From 673762cbee421c6a65a08c8bfb06d9aca57d405e Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 13 Jul 2011 12:49:38 +0530 Subject: [PATCH 048/167] [FIX] Logout will not maintain last visited database option. bzr revid: noz@tinyerp.com-20110713071938-wf84d6krykkxxg14 --- addons/base/static/src/js/chrome.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 7db8f4bfa7f..db831387823 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -912,6 +912,7 @@ openerp.base.Database = openerp.base.Controller.extend({ this._super(session, element_id); this.option_id = option_id; this.$option_id = $('#' + option_id); + this.$option_id.html(''); }, start: function() { this.$element.html(QWeb.render("Database", this)); From 8b5f33ad159e4652185a56b1aebfb5344985be3e Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 13 Jul 2011 14:32:18 +0530 Subject: [PATCH 049/167] [IMP] improve code and extend openerp.base.Dialog class and used this class for export dialog. bzr revid: ysa@tinyerp.com-20110713090218-aw9akqd48aey4w2h --- addons/base/static/src/js/views.js | 2 +- .../base_export/static/src/js/base_export.js | 99 +++++++++---------- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index da50e62c713..7f80046e645 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -169,7 +169,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) this.$element.find('#exportview').click(function(ev) { var export_view = new openerp.base_export.Export(self.session, self.dataset, self.views); - export_view.start(); + export_view.start(false); ev.preventDefault(); }); } diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 32f20a39aa9..bc2dd73d8b5 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -6,25 +6,21 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ init: function(session, dataset, views){ this._super(session); this.dataset = dataset - this.views = views this.selected_field_id = ''; this.selected_field_str = ''; }, start: function() { - this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_loaded); - }, - - on_loaded: function(result) { - var self = this; - var element_id = _.uniqueId("act_window_dialog"); - this._export = $('
', {id: element_id}).dialog({ - title: "Export Data", - modal: true, - width: '50%', - height: 'auto', - position: 'top', - buttons : { + var self = this + self._super(false); + self.template = 'ExportTreeView'; + self.dialog_title = "Export Data " + self.open({ + modal: true, + width: '50%', + height: 'auto', + position: 'top', + buttons : { "Close" : function() { self.close(); }, @@ -32,63 +28,64 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.get_fields(); } }, - close: function(event, ui){ self.close();}, - }).html(QWeb.render('ExportTreeView')) - self.on_show_data(result) - jQuery(this._export).find('#add_field').click(function(){ + close: function(event, ui){ self.close();} + }); + jQuery(self.$dialog).find('#add_field').click(function(){ if (self.selected_field_id && self.selected_field_str){ self.add_field(self.selected_field_id, self.selected_field_str); } }); - jQuery(this._export).find('#remove_field').click(function(){ - jQuery(self._export).find("#fields_list option:selected").remove(); + jQuery(self.$dialog).find('#remove_field').click(function(){ + jQuery(self.$dialog).find("#fields_list option:selected").remove(); }); - jQuery(this._export).find('#remove_all_field').click(function(){ - jQuery(self._export).find("#fields_list option").remove(); + jQuery(self.$dialog).find('#remove_all_field').click(function(){ + jQuery(self.$dialog).find("#fields_list option").remove(); }); + this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_show_data); }, on_click: function(id, result) { var self = this - this.field_id = id.split("-")[1]; + self.field_id = id.split("-")[1]; var model = '' var prefix = '' var name = '' var is_loaded = 0; - for (var record in result){ - if(result[record]['id'] == this.field_id){ - model = result[record]['params']['model'] - prefix = result[record]['params']['prefix'] - name = result[record]['params']['name'] - if ( (result[record]['children']).length >= 1){ - $(result[record]['children']).each (function(e, childid) { + _.each(result, function(record) { + if(record['id'] == self.field_id){ + model = record['params']['model'] + prefix = record['params']['prefix'] + name = record['params']['name'] + if ((record['children']).length >= 1){ + $(record['children']).each (function(e, childid) { if ($("tr[id='treerow_" + childid +"']").length > 0) { if ($("tr[id='treerow_" + childid +"']").is(':hidden')) { is_loaded = -1; } else { - is_loaded++; - } - } - }); - if (is_loaded == 0) { - if ($("tr[id='treerow_" + this.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { + is_loaded++; + } + } + }); + if (is_loaded == 0) { + if ($("tr[id='treerow_" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { if (model){ - this.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : this.field_id, "name": name}, function (result) { - self.on_show_data(result, true); + self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : self.field_id, "name": name}, function (results) { + self.on_show_data(results); }); } } - } else if (is_loaded > 0) { - self.showcontent(this.field_id, true); - } else { - self.showcontent(this.field_id, false); - } - } - } - } + } else if (is_loaded > 0) { + self.showcontent(self.field_id, true); + } else { + self.showcontent(self.field_id, false); + } + } + } + + }); }, - on_show_data: function(result, flag) { + on_show_data: function(result) { var self = this; var current_tr = $("tr[id='treerow_" + self.field_id + "']"); if (current_tr.length >= 1){ @@ -96,7 +93,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } else{ - jQuery(self._export).find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + jQuery(this.$dialog).find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } jQuery($.find('img[id ^= parentimg]')).click(function(){ self.on_click(this.id, result); @@ -157,13 +154,13 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ alert('Please select fields to export...'); } else { - this._export.dialog('close'); + this.close(); } }, close: function() { - jQuery(this._export).remove(); - this._export.dialog('close'); + jQuery(this.$dialog).remove(); + this._super(); }, }); From 59bb0fd4e637cd4100e53d24df184ad5c53ed86b Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 13 Jul 2011 14:52:42 +0530 Subject: [PATCH 050/167] [FIX] Better error popup messages. bzr revid: noz@tinyerp.com-20110713092242-0q5ii7haqfhldgtl --- addons/base/controllers/main.py | 34 ++++++++--- addons/base/static/src/js/chrome.js | 95 ++++++++++++++++++++++------- openerpweb/openerpweb.py | 29 +++------ 3 files changed, 107 insertions(+), 51 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 2df86d3ce7e..618d86f3750 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -130,7 +130,13 @@ class Session(openerpweb.Controller): db = kw.get('db') password = kw.get('password') - return req.session.proxy("db").drop(password, db) + try: + return req.session.proxy("db").drop(password, db) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !'} + else: + return {'error': 'Could not drop database !'} elif flag == 'backup': db = kw.get('db') @@ -141,8 +147,11 @@ class Session(openerpweb.Controller): cherrypy.response.headers['Content-Type'] = "application/data" cherrypy.response.headers['Content-Disposition'] = 'filename="' + db + '.dump"' return base64.decodestring(res) - except Exception: - return {'error': 'Could not create backup !'} + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !'} + else: + return {'error': 'Could not drop database !'} elif flag == 'restore': filename = kw.get('filename') @@ -150,19 +159,26 @@ class Session(openerpweb.Controller): password = kw.get('password') try: - if filename: - data = base64.encodestring(filename.file.read()) - return req.session.proxy("db").restore(password, db, data) - except Exception: - return {'error': 'Could not restore database !'} + data = base64.encodestring(filename.file.read()) + return req.session.proxy("db").restore(password, db, data) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !'} + else: + return {'error': 'Could not restore database !'} elif flag == 'change_password': old_password = kw.get('old_password') new_password = kw.get('new_password') confirm_password = kw.get('confirm_password') - if old_password and new_password and confirm_password: + try: return req.session.proxy("db").change_admin_password(old_password, new_password) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !'} + else: + return {'error': 'Error, password not changed !'} @openerpweb.jsonrequest def modules(self, req): diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index db831387823..47e3de67677 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -974,18 +974,29 @@ openerp.base.Database = openerp.base.Controller.extend({ demo_data = 'False'; self.rpc("/base/session/db_operation", { - 'flag': 'create', - 'super_admin_pwd': super_admin_pwd, - 'db': db, - 'demo_data': demo_data, - 'db_lang': db_lang, - 'admin_pwd': admin_pwd, - 'confirm_pwd': confirm_pwd - }, - function(result) { - if (result && !result.error) { - - } + 'flag': 'create', + 'super_admin_pwd': super_admin_pwd, + 'db': db, + 'demo_data': demo_data, + 'db_lang': db_lang, + 'admin_pwd': admin_pwd, + 'confirm_pwd': confirm_pwd + }, + function(result) { + if (result && !result.error) { + + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: "Create Database", + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } }); }); }, @@ -1005,12 +1016,23 @@ openerp.base.Database = openerp.base.Controller.extend({ if (confirm("Do you really want to delete the database: " + db + " ?")) { self.rpc("/base/session/db_operation", {'flag': 'drop', 'db': db, 'password': password}, - function(result) { - if (result && !result.error) { - self.$option_id.find("select[name=drop_db] :selected").remove(); - self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); - } - }); + function(result) { + if (result && ! result.error) { + self.$option_id.find("select[name=drop_db] :selected").remove(); + self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: "Drop Database", + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); } }); }, @@ -1032,8 +1054,17 @@ openerp.base.Database = openerp.base.Controller.extend({ function(result) { if (result && !result.error) { self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'"); - } else if (result.error) { - self.notification.notify("Backup Database", result.error); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: "Backup Database", + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); } }); }); @@ -1057,8 +1088,17 @@ openerp.base.Database = openerp.base.Controller.extend({ function(result) { if (result && !result.error) { self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'"); - } else if (result.error) { - self.notification.notify("Restore Database", result.error); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: "Restore Database", + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); } }); }); @@ -1103,6 +1143,17 @@ openerp.base.Database = openerp.base.Controller.extend({ function(result) { if (result && !result.error) { self.notification.notify("Changed Password", "Password has been changed successfully"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: "Change Password", + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); } }); }); diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 25beb6bbcee..13864d3e026 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -314,27 +314,16 @@ class JsonRequest(object): } } except xmlrpclib.Fault, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - message, string = e.faultCode.split(':') - error = { - 'code': 200, - 'message': message, - 'data': { - 'type': 'server_exception', - 'debug': string - } - } - else: - error = { - 'code': 200, - 'message': "OpenERP Server Error", - 'data': { - 'type': 'server_exception', - 'fault_code': e.faultCode, - 'debug': "Client %s\nServer %s" % ( - "".join(traceback.format_exception("", None, sys.exc_traceback)), e.faultString) - } + error = { + 'code': 200, + 'message': "OpenERP Server Error", + 'data': { + 'type': 'server_exception', + 'fault_code': e.faultCode, + 'debug': "Client %s\nServer %s" % ( + "".join(traceback.format_exception("", None, sys.exc_traceback)), e.faultString) } + } except Exception: cherrypy.log("An error occured while handling a json request", severity=logging.ERROR, traceback=True) From e370808a8436f46f4b26a3af62addfe766d095b8 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 13 Jul 2011 15:13:39 +0530 Subject: [PATCH 051/167] [FIX] Validation for bad database name. bzr revid: noz@tinyerp.com-20110713094339-1612ynj0dc40roo7 --- addons/base/controllers/main.py | 29 +++++++++++++++++++---------- addons/base/static/src/js/chrome.js | 10 +++++----- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 5657ef13aaf..b5fc07cc2a6 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import base64 -import glob, os +import glob, os, re from xml.etree import ElementTree from cStringIO import StringIO @@ -124,7 +124,16 @@ class Session(openerpweb.Controller): def db_operation(self, req, flag, **kw): if flag == 'create': - pass + + super_admin_pwd = kw.get('super_admin_pwd') + dbname = kw.get('db') + demo_data = kw.get('demo_data') + db_lang = kw.get('db_lang') + admin_pwd = kw.get('admin_pwd') + confirm_pwd = kw.get('confirm_pwd') + + if not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname): + return {'error': "You must avoid all accents, space or special characters.", 'title': 'Bad database name'} elif flag == 'drop': db = kw.get('db') @@ -134,9 +143,9 @@ class Session(openerpweb.Controller): return req.session.proxy("db").drop(password, db) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !'} + return {'error': 'Bad super admin password !', 'title': 'Drop Database'} else: - return {'error': 'Could not drop database !'} + return {'error': 'Could not drop database !', 'title': 'Drop Database'} elif flag == 'backup': db = kw.get('db') @@ -149,9 +158,9 @@ class Session(openerpweb.Controller): return base64.decodestring(res) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !'} + return {'error': 'Bad super admin password !', 'title': 'Backup Database'} else: - return {'error': 'Could not drop database !'} + return {'error': 'Could not drop database !', 'title': 'Backup Database'} elif flag == 'restore': filename = kw.get('filename') @@ -163,9 +172,9 @@ class Session(openerpweb.Controller): return req.session.proxy("db").restore(password, db, data) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !'} + return {'error': 'Bad super admin password !', 'title': 'Restore Database'} else: - return {'error': 'Could not restore database !'} + return {'error': 'Could not restore database !', 'title': 'Restore Database'} elif flag == 'change_password': old_password = kw.get('old_password') @@ -176,9 +185,9 @@ class Session(openerpweb.Controller): return req.session.proxy("db").change_admin_password(old_password, new_password) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !'} + return {'error': 'Bad super admin password !', 'title': 'Change Password'} else: - return {'error': 'Error, password not changed !'} + return {'error': 'Error, password not changed !', 'title': 'Change Password'} @openerpweb.jsonrequest def modules(self, req): diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 98f0af5a8d1..934868651de 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -990,7 +990,7 @@ openerp.base.Database = openerp.base.Controller.extend({ var db_error_dialog = _.uniqueId("db_error_dialog"); $('
', {id: db_error_dialog}).dialog({ modal: true, - title: "Create Database", + title: result.title, buttons: { Ok: function() { $(this).dialog("close"); @@ -1025,7 +1025,7 @@ openerp.base.Database = openerp.base.Controller.extend({ var db_error_dialog = _.uniqueId("db_error_dialog"); $('
', {id: db_error_dialog}).dialog({ modal: true, - title: "Drop Database", + title: result.title, buttons: { Ok: function() { $(this).dialog("close"); @@ -1059,7 +1059,7 @@ openerp.base.Database = openerp.base.Controller.extend({ var db_error_dialog = _.uniqueId("db_error_dialog"); $('
', {id: db_error_dialog}).dialog({ modal: true, - title: "Backup Database", + title: result.title, buttons: { Ok: function() { $(this).dialog("close"); @@ -1093,7 +1093,7 @@ openerp.base.Database = openerp.base.Controller.extend({ var db_error_dialog = _.uniqueId("db_error_dialog"); $('
', {id: db_error_dialog}).dialog({ modal: true, - title: "Restore Database", + title: result.title, buttons: { Ok: function() { $(this).dialog("close"); @@ -1148,7 +1148,7 @@ openerp.base.Database = openerp.base.Controller.extend({ var db_error_dialog = _.uniqueId("db_error_dialog"); $('
', {id: db_error_dialog}).dialog({ modal: true, - title: "Change Password", + title: result.title, buttons: { Ok: function() { $(this).dialog("close"); From dfb7f58c4022852f5f5d901095294718d151218e Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 13 Jul 2011 16:05:52 +0530 Subject: [PATCH 052/167] [FIX] Partially implemented Create Database (DB creation without any configuration wizard). bzr revid: noz@tinyerp.com-20110713103552-47ncaeqafv26vb12 --- addons/base/controllers/main.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index b5fc07cc2a6..6dfbdba0bf9 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -56,6 +56,9 @@ class Xml2Json: # OpenERP Web base Controllers #---------------------------------------------------------- +class DatabaseCreationError(Exception): pass +class DatabaseCreationCrash(DatabaseCreationError): pass + class Session(openerpweb.Controller): _cp_path = "/base/session" @@ -134,6 +137,31 @@ class Session(openerpweb.Controller): if not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname): return {'error': "You must avoid all accents, space or special characters.", 'title': 'Bad database name'} + + ok = False + try: + return req.session.proxy("db").create(super_admin_pwd, dbname, demo_data, db_lang, admin_pwd) +# while True: +# try: +# progress, users = req.session.proxy('db').get_progress(super_admin_pwd, res) +# if progress == 1.0: +# for x in users: +# if x['login'] == 'admin': +# req.session.login(dbname, 'admin', x['password']) +# ok = True +# break +# else: +# time.sleep(1) +# except: +# raise DatabaseCreationCrash() +# except DatabaseCreationCrash: +# return {'error': "The server crashed during installation.\nWe suggest you to drop this database.", +# 'title': 'Error during database creation'} + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !', 'title': 'Create Database'} + else: + return {'error': 'Could not create database !', 'title': 'Create Database'} elif flag == 'drop': db = kw.get('db') From 59aa97860bfe80ba890d257829fb620f21c06705 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 13 Jul 2011 16:23:14 +0530 Subject: [PATCH 053/167] [FIX] Removed print statement. bzr revid: noz@tinyerp.com-20110713105314-bgbbw3xt2loo2h8w --- addons/base/controllers/main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 561086d646d..a8016669018 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -68,9 +68,8 @@ class Database(openerpweb.Controller): dbs = proxy.list() h = req.httprequest.headers['Host'].split(':')[0] d = h.split(':')[0] - r = cherrypy.config['openerp.dbfilter'].replace('%h',h).replace('%d',d) - print "h,d",h,d,r - dbs = [i for i in dbs if re.match(r,i)] + r = cherrypy.config['openerp.dbfilter'].replace('%h', h).replace('%d', d) + dbs = [i for i in dbs if re.match(r, i)] return {"db_list": dbs} @openerpweb.jsonrequest From a4168644d5244417865bfc0ad29dfa8d1dddbaac Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 13 Jul 2011 18:36:51 +0530 Subject: [PATCH 054/167] [IMP] left side multiple selected field move to right panel in export dialog box. bzr revid: ysa@tinyerp.com-20110713130651-imuct7olrl0e385e --- .../base_export/static/src/js/base_export.js | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index bc2dd73d8b5..eb0fbd244f2 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -6,8 +6,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ init: function(session, dataset, views){ this._super(session); this.dataset = dataset - this.selected_field_id = ''; - this.selected_field_str = ''; + this.selected_fields = {}; }, start: function() { @@ -31,9 +30,9 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ close: function(event, ui){ self.close();} }); jQuery(self.$dialog).find('#add_field').click(function(){ - if (self.selected_field_id && self.selected_field_str){ - self.add_field(self.selected_field_id, self.selected_field_str); - } + for (var key in self.selected_fields) { + self.add_field(key, self.selected_fields[key]) + } }); jQuery(self.$dialog).find('#remove_field').click(function(){ jQuery(self.$dialog).find("#fields_list option:selected").remove(); @@ -99,24 +98,32 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.on_click(this.id, result); }); jQuery($.find('[id^=export-]')).dblclick(function(){ - self.add_field(this.id, this.text) + self.add_field(this.id.split('-')[1], this.text) }); jQuery($.find('[id^=export-]')).click(function(){ - self.selected_field_id = this.id; - self.selected_field_str = this.text; + self.on_field_click(this); }); jQuery($.find('#fields_list')).mouseover(function(event){ if(event.relatedTarget){ if ('id' in event.relatedTarget.attributes && 'string' in event.relatedTarget.attributes){ field_id = event.relatedTarget.attributes["id"]["value"] if (field_id && field_id.split("-")[0] == 'export'){ - self.add_field(event.relatedTarget.attributes['id']["value"], event.relatedTarget.attributes["string"]["value"]); + self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]); } } } }); }, + on_field_click: function(ids){ + var self = this; + field_id = ids.id.split("-")[1]; + self.selected_fields = {}; + if (!(field_id in self.selected_fields)){ + self.selected_fields[field_id] = ids.text; + } + }, + // show & hide the contents showcontent: function (id, flag) { var first_child = $("tr[id='treerow_" + id + "']").find('img') @@ -137,9 +144,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }, - add_field: function(id, string) { + add_field: function(field_id, string) { var field_list = $('#fields_list') - field_id = id.split("-")[1]; if ( $("#fields_list option[value='" + field_id + "']") && !$("#fields_list option[value='" + field_id + "']").length){ field_list.append( new Option(string, field_id)); } From 191361eda0c1f85bebb86d06491ebbe930ed1e6e Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Thu, 14 Jul 2011 10:57:03 +0530 Subject: [PATCH 055/167] [IMP]Implement bind arrow key for open and close child node. bzr revid: kch@tinyerp.com-20110714052703-o4d5ef985zt612s6 --- .../base_export/static/src/js/base_export.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index eb0fbd244f2..b0d63e3b538 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -103,6 +103,26 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ jQuery($.find('[id^=export-]')).click(function(){ self.on_field_click(this); }); + + $('[id^=export-]').keydown(function (e) { + var keyCode = e.keyCode || e.which, + arrow = {left: 37, up: 38, right: 39, down: 40 }; + switch (keyCode) { + case arrow.left: + self.on_click(this.id, result); + break; + case arrow.up: + //.. + break; + case arrow.right: + self.on_click(this.id, result); + break; + case arrow.down: + //.. + break; + } + }); + jQuery($.find('#fields_list')).mouseover(function(event){ if(event.relatedTarget){ if ('id' in event.relatedTarget.attributes && 'string' in event.relatedTarget.attributes){ From e790623f9091a6ac582e91cc9244298cf296aa1e Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 14 Jul 2011 11:43:52 +0530 Subject: [PATCH 056/167] [IMP] improve code and fix problem of show tree structure. bzr revid: ysa@tinyerp.com-20110714061352-6f47mbow332ats0m --- .../base_export/static/src/js/base_export.js | 90 ++++++++++--------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index b0d63e3b538..abd0d1684b8 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -29,15 +29,15 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ }, close: function(event, ui){ self.close();} }); - jQuery(self.$dialog).find('#add_field').click(function(){ - for (var key in self.selected_fields) { - self.add_field(key, self.selected_fields[key]) - } + $('#add_field').click(function(){ + for (var key in self.selected_fields) { + self.add_field(key, self.selected_fields[key]) + } }); - jQuery(self.$dialog).find('#remove_field').click(function(){ + $('#remove_field').click(function(){ jQuery(self.$dialog).find("#fields_list option:selected").remove(); }); - jQuery(self.$dialog).find('#remove_all_field').click(function(){ + $('#remove_all_field').click(function(){ jQuery(self.$dialog).find("#fields_list option").remove(); }); this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_show_data); @@ -45,39 +45,37 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ on_click: function(id, result) { var self = this - self.field_id = id.split("-")[1]; - var model = '' - var prefix = '' - var name = '' - var is_loaded = 0; + self.field_id = id.split("-")[1]; + var model = '' + var prefix = '' + var name = '' + var is_loaded = 0; _.each(result, function(record) { - if(record['id'] == self.field_id){ + if(record['id'] == self.field_id && (record['children']).length >= 1){ model = record['params']['model'] prefix = record['params']['prefix'] name = record['params']['name'] - if ((record['children']).length >= 1){ - $(record['children']).each (function(e, childid) { - if ($("tr[id='treerow_" + childid +"']").length > 0) { - if ($("tr[id='treerow_" + childid +"']").is(':hidden')) { - is_loaded = -1; - } else { - is_loaded++; - } + $(record['children']).each (function(e, childid) { + if ($("tr[id='treerow_" + childid +"']").length > 0) { + if ($("tr[id='treerow_" + childid +"']").is(':hidden')) { + is_loaded = -1; + } else { + is_loaded++; } - }); - if (is_loaded == 0) { - if ($("tr[id='treerow_" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { - if (model){ - self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : self.field_id, "name": name}, function (results) { - self.on_show_data(results); - }); - } - } - } else if (is_loaded > 0) { - self.showcontent(self.field_id, true); - } else { - self.showcontent(self.field_id, false); } + }); + if (is_loaded == 0) { + if ($("tr[id='treerow_" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { + if (model){ + self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : self.field_id, "name": name}, function (results) { + self.on_show_data(results); + }); + } + } + } else if (is_loaded > 0) { + self.showcontent(self.field_id, true); + } else { + self.showcontent(self.field_id, false); } } @@ -92,15 +90,15 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } else{ - jQuery(this.$dialog).find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } - jQuery($.find('img[id ^= parentimg]')).click(function(){ + $('img[id ^= parentimg]').click(function(){ self.on_click(this.id, result); }); - jQuery($.find('[id^=export-]')).dblclick(function(){ + $('[id^=export-]').dblclick(function(){ self.add_field(this.id.split('-')[1], this.text) }); - jQuery($.find('[id^=export-]')).click(function(){ + $('[id^=export-]').click(function(){ self.on_field_click(this); }); @@ -123,7 +121,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }); - jQuery($.find('#fields_list')).mouseover(function(event){ + $('#fields_list').mouseover(function(event){ if(event.relatedTarget){ if ('id' in event.relatedTarget.attributes && 'string' in event.relatedTarget.attributes){ field_id = event.relatedTarget.attributes["id"]["value"] @@ -154,21 +152,27 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ first_child.attr('src', '/base/static/src/img/collapse.gif'); } var child_field = $("tr[id^='treerow_" + id +"/']") + var child_len = (id.split("/")).length + 1 for (var i = 0; i < child_field.length; i++) { if (flag) { $(child_field[i]).hide(); } else { - $(child_field[i]).show(); + if(child_len == (child_field[i].id.split("/")).length){ + if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ + jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif') + } + $(child_field[i]).show(); + } } } }, add_field: function(field_id, string) { - var field_list = $('#fields_list') - if ( $("#fields_list option[value='" + field_id + "']") && !$("#fields_list option[value='" + field_id + "']").length){ - field_list.append( new Option(string, field_id)); - } + var field_list = $('#fields_list') + if ( $("#fields_list option[value='" + field_id + "']") && !$("#fields_list option[value='" + field_id + "']").length){ + field_list.append( new Option(string, field_id)); + } }, get_fields: function (){ From 2e2ff402fc0fafa85bfae2a5cda9bab9ea948b42 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 14 Jul 2011 12:39:45 +0530 Subject: [PATCH 057/167] [IMP] improve functionality of left and right arrow in export tree structure. bzr revid: ysa@tinyerp.com-20110714070945-448n11l9avevfng0 --- .../base_export/static/src/js/base_export.js | 51 ++++++++++--------- .../static/src/xml/base_export.xml | 2 +- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index abd0d1684b8..33380d8f613 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -56,8 +56,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ prefix = record['params']['prefix'] name = record['params']['name'] $(record['children']).each (function(e, childid) { - if ($("tr[id='treerow_" + childid +"']").length > 0) { - if ($("tr[id='treerow_" + childid +"']").is(':hidden')) { + if ($("tr[id='treerow-" + childid +"']").length > 0) { + if ($("tr[id='treerow-" + childid +"']").is(':hidden')) { is_loaded = -1; } else { is_loaded++; @@ -65,7 +65,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }); if (is_loaded == 0) { - if ($("tr[id='treerow_" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { + if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { if (model){ self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : self.field_id, "name": name}, function (results) { self.on_show_data(results); @@ -84,7 +84,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ on_show_data: function(result) { var self = this; - var current_tr = $("tr[id='treerow_" + self.field_id + "']"); + var current_tr = $("tr[id='treerow-" + self.field_id + "']"); if (current_tr.length >= 1){ current_tr.find('img').attr('src','/base/static/src/img/collapse.gif'); current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); @@ -101,24 +101,27 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $('[id^=export-]').click(function(){ self.on_field_click(this); }); - - $('[id^=export-]').keydown(function (e) { - var keyCode = e.keyCode || e.which, - arrow = {left: 37, up: 38, right: 39, down: 40 }; - switch (keyCode) { - case arrow.left: - self.on_click(this.id, result); - break; - case arrow.up: - //.. - break; - case arrow.right: - self.on_click(this.id, result); - break; - case arrow.down: - //.. - break; - } + $("tr[id^='treerow-']").keydown(function (e) { + var keyCode = e.keyCode || e.which; + arrow = {left: 37, up: 38, right: 39, down: 40 }; + switch (keyCode) { + case arrow.left: + if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ + self.on_click(this.id, result); + } + break; + case arrow.up: + //.. + break; + case arrow.right: + if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ + self.on_click(this.id, result); + } + break; + case arrow.down: + //.. + break; + } }); $('#fields_list').mouseover(function(event){ @@ -144,14 +147,14 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ // show & hide the contents showcontent: function (id, flag) { - var first_child = $("tr[id='treerow_" + id + "']").find('img') + var first_child = $("tr[id='treerow-" + id + "']").find('img') if (flag) { first_child.attr('src', '/base/static/src/img/expand.gif'); } else { first_child.attr('src', '/base/static/src/img/collapse.gif'); } - var child_field = $("tr[id^='treerow_" + id +"/']") + var child_field = $("tr[id^='treerow-" + id +"/']") var child_len = (id.split("/")).length + 1 for (var i = 0; i < child_field.length; i++) { if (flag) { diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index e2a653e4465..ef3d3de4af4 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -82,7 +82,7 @@ - + From 78890bc3de6c381f4aa1c5082d5841bf4810e234 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 14 Jul 2011 17:11:43 +0530 Subject: [PATCH 058/167] [IMP] Implement save export list in db. bzr revid: ysa@tinyerp.com-20110714114143-rsrkae7ve1gpap00 --- addons/base_export/controllers/main.py | 9 +++++ .../base_export/static/src/js/base_export.js | 39 +++++++++++++++++-- .../static/src/xml/base_export.xml | 13 ++++++- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index eb475e59a21..e3b7de03413 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -58,3 +58,12 @@ class Export(View): records.reverse() return records + + @openerpweb.jsonrequest + def save_export_lists(self, req, name, model, field_list): + result = {'resource':model, 'name':name, 'export_fields': []} + for field in field_list: + result['export_fields'].append((0, 0, {'name': field})) + req.session.model("ir.exports").create(result, req.session.eval_context(req.context)) + return True + diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 33380d8f613..0a3ea7cf53b 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -40,8 +40,43 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $('#remove_all_field').click(function(){ jQuery(self.$dialog).find("#fields_list option").remove(); }); + $('#export_new_list').click(function(){ + self.on_show_save_list(); + }); this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_show_data); }, + on_show_save_list: function(){ + var self = this; + var current_node = $("#savenewlist"); + if(!(current_node.find("label")).length){ + current_node.append(QWeb.render('ExportNewList')); + current_node.find("#add_export_list").click(function(){ + var value = current_node.find("#savelist_name").val(); + if (value){ + self.do_save_export_list(value); + } + else{ + alert("Pleae Enter Save Field List Name"); + } + + }); + } + else{ + if (current_node.is(':hidden')){ + current_node.show(); + } + else{ + current_node.hide(); + } + } + }, + + do_save_export_list: function(value){ + var export_field = this.get_fields() + if(export_field.length){ + this.rpc("/base_export/export/save_export_lists", {"model": this.dataset.model, "name":value, "field_list":export_field}, {}); + } + }, on_click: function(id, result) { var self = this @@ -186,9 +221,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ if (! export_field.length){ alert('Please select fields to export...'); } - else { - this.close(); - } + return export_field; }, close: function() { diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index ef3d3de4af4..21eeccfe52c 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -34,7 +34,10 @@ - + + + + + + + + + \ No newline at end of file From 03451e85940eca8d284beb46cecda23ba87fdc45 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Thu, 14 Jul 2011 17:58:25 +0530 Subject: [PATCH 059/167] [IMP]Implement up and down arrow key in export tree structure. bzr revid: kch@tinyerp.com-20110714122825-0omxwj3z039f82g2 --- .../base_export/static/src/js/base_export.js | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 0a3ea7cf53b..38abbb219c0 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -128,6 +128,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } $('img[id ^= parentimg]').click(function(){ + var elem_id = this.id.split("-")[1]; + $($.find("tr[id='treerow-" + elem_id + "']")).find('a').focus(); self.on_click(this.id, result); }); $('[id^=export-]').dblclick(function(){ @@ -137,26 +139,30 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.on_field_click(this); }); $("tr[id^='treerow-']").keydown(function (e) { - var keyCode = e.keyCode || e.which; - arrow = {left: 37, up: 38, right: 39, down: 40 }; - switch (keyCode) { - case arrow.left: - if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ - self.on_click(this.id, result); - } - break; - case arrow.up: - //.. - break; - case arrow.right: - if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ - self.on_click(this.id, result); - } - break; - case arrow.down: - //.. - break; - } + var keyCode = e.keyCode || e.which; + arrow = {left: 37, up: 38, right: 39, down: 40 }; + switch (keyCode) { + case arrow.left: + if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ + self.on_click(this.id, result); + } + break; + case arrow.up: + $(this).prev().find('a').focus(); + break; + case arrow.right: + if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ + self.on_click(this.id, result); + } + break; + case arrow.down: + var elem = this; + while($(elem).next().is(":visible") == false){ + elem = $(elem).next(); + } + $(elem).next().find('a').focus(); + break; + } }); $('#fields_list').mouseover(function(event){ From 3805f31e9d904fdb0781118739db069355299f56 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 14 Jul 2011 18:50:11 +0530 Subject: [PATCH 060/167] [IMP] after create list fields are hidden and remove all field in export list. bzr revid: ysa@tinyerp.com-20110714132011-9dunrdg9aswgd7g1 --- addons/base_export/static/src/js/base_export.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 38abbb219c0..a25012cea44 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -35,10 +35,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }); $('#remove_field').click(function(){ - jQuery(self.$dialog).find("#fields_list option:selected").remove(); + $("#fields_list option:selected").remove(); }); $('#remove_all_field').click(function(){ - jQuery(self.$dialog).find("#fields_list option").remove(); + $("#fields_list option").remove(); }); $('#export_new_list').click(function(){ self.on_show_save_list(); @@ -75,6 +75,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ var export_field = this.get_fields() if(export_field.length){ this.rpc("/base_export/export/save_export_lists", {"model": this.dataset.model, "name":value, "field_list":export_field}, {}); + this.on_show_save_list() + $("#fields_list option").remove(); } }, @@ -221,7 +223,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ get_fields: function (){ var export_field = []; - jQuery("#fields_list option").each(function(){ + $("#fields_list option").each(function(){ export_field.push(jQuery(this).val()); }); if (! export_field.length){ From 8596daa98bba6fc8ad99f4300d0cbf5fd71f1fcc Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 15 Jul 2011 11:27:46 +0530 Subject: [PATCH 061/167] [IMP] improve template of export tree structure and tree open on 2 level. bzr revid: ysa@tinyerp.com-20110715055746-m2ukkqyrxcnqmcy2 --- addons/base_export/controllers/main.py | 4 +--- addons/base_export/static/src/xml/base_export.xml | 10 +++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index e3b7de03413..bb633852192 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -21,10 +21,8 @@ class Export(View): id = prefix + (prefix and '/'or '') + key nm = name + (name and '/' or '') + value['string'] - levels = nm.split('/') - levels > 1 and levels.remove(levels[0]) or [] record.update(id=id, string= nm, action='javascript: void(0)', - target=None, icon=None, children=[], level = levels) + target=None, icon=None, children=[]) records.append(record) if value.get('relation', False): diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index 21eeccfe52c..b8fff4e6064 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -89,12 +89,16 @@
Available fields Fields to exportFields to export + Save fields list +
+
@@ -105,4 +108,12 @@
- - + + + +
&nbsp;&nbsp; - + + + From e16e35e00fb01b230159ccab76ed37826178ef66 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 15 Jul 2011 15:53:14 +0530 Subject: [PATCH 062/167] [IMP] implement save export list functionality. bzr revid: ysa@tinyerp.com-20110715102314-pvz1uyke4wjhk8xl --- addons/base_export/controllers/main.py | 12 ++++- .../base_export/static/src/js/base_export.js | 53 +++++++++++++++++-- .../static/src/xml/base_export.xml | 30 ++++++++--- 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index bb633852192..adb0b9e6e9f 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -62,6 +62,14 @@ class Export(View): result = {'resource':model, 'name':name, 'export_fields': []} for field in field_list: result['export_fields'].append((0, 0, {'name': field})) - req.session.model("ir.exports").create(result, req.session.eval_context(req.context)) - return True + return req.session.model("ir.exports").create(result, req.session.eval_context(req.context)) + @openerpweb.jsonrequest + def exist_export_lists(self, req, model): + export_model = req.session.model("ir.exports") + return export_model.read(export_model.search([('resource', '=', model)]), ['name']) + + @openerpweb.jsonrequest + def delete_export(self, req, export_id): + req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context)) + return True diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index a25012cea44..7b1137ac6ae 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -29,6 +29,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ }, close: function(event, ui){ self.close();} }); + this.on_show_exists_export_list(); $('#add_field').click(function(){ for (var key in self.selected_fields) { self.add_field(key, self.selected_fields[key]) @@ -44,7 +45,33 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.on_show_save_list(); }); this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_show_data); + }, + + on_show_exists_export_list: function(){ + var self = this; + if($("#saved_export_list").is(":hidden")){ + $("#ExistsExportList").show(); + } + else{ + this.rpc("/base_export/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){ + if(export_list.length){ + $("#ExistsExportList").append(QWeb.render('Exists.ExportList', {'existing_exports':export_list})); + $('#delete_export_list').click(function(){ + select_exp = $("#saved_export_list option:selected") + if (select_exp.val()){ + self.rpc("/base_export/export/delete_export", {"export_id": parseInt(select_exp.val())}, {}); + select_exp.remove(); + if($("#saved_export_list option").length <= 1){ + $("#ExistsExportList").hide(); + } + } + }); + } + }); + } + }, + on_show_save_list: function(){ var self = this; var current_node = $("#savenewlist"); @@ -58,7 +85,6 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ else{ alert("Pleae Enter Save Field List Name"); } - }); } else{ @@ -72,10 +98,23 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ }, do_save_export_list: function(value){ - var export_field = this.get_fields() + var self = this; + var export_field = self.get_fields() if(export_field.length){ - this.rpc("/base_export/export/save_export_lists", {"model": this.dataset.model, "name":value, "field_list":export_field}, {}); - this.on_show_save_list() + self.rpc("/base_export/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id){ + if(exp_id){ + if($("#saved_export_list").length > 0){ + $("#saved_export_list").append( new Option(value, exp_id)); + } + else{ + self.on_show_exists_export_list(); + } + if($("#saved_export_list").is(":hidden")){ + self.on_show_exists_export_list(); + } + } + }); + self.on_show_save_list() $("#fields_list option").remove(); } }, @@ -150,7 +189,11 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } break; case arrow.up: - $(this).prev().find('a').focus(); + var elem = this; + while($(elem).prev().is(":visible") == false){ + elem = $(elem).prev(); + } + $(elem).prev().find('a').focus(); break; case arrow.right: if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index b8fff4e6064..c5459ad888b 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -5,7 +5,7 @@ - +
-
This wizard will export all data that matches the current search criteria to a CSV file. @@ -29,20 +29,21 @@
- +
+ - +
Available fieldsAvailable fields Fields to export Save fields list
+
- +
Name
@@ -55,7 +56,7 @@ - +
- + + + + + + + + + \ No newline at end of file From dc8889a339c4da1c2ce2f5f93b8aaaf63a556b0e Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 15 Jul 2011 17:52:01 +0530 Subject: [PATCH 063/167] [IMP] add onchange event of selection box and base on load field name in export list. bzr revid: ysa@tinyerp.com-20110715122201-9x60axor2glholzb --- addons/base_export/controllers/main.py | 54 ++++++++++++++++++- .../base_export/static/src/js/base_export.js | 42 ++++++++++----- 2 files changed, 80 insertions(+), 16 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index adb0b9e6e9f..89a1d8be6d8 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -7,14 +7,13 @@ class Export(View): def fields_get(self, req, model): Model = req.session.model(model) fields = Model.fields_get(False, req.session.eval_context(req.context)) + fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) return fields @openerpweb.jsonrequest def get_fields(self, req, model, prefix='', field_parent=None, name= ''): fields = self.fields_get(req, model) - fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) - records = [] for key, value in fields.items(): record = {} @@ -73,3 +72,54 @@ class Export(View): def delete_export(self, req, export_id): req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context)) return True + + @openerpweb.jsonrequest + def namelist(self,req, model, export_id): + + result = self.get_data(req, model, req.session.eval_context(req.context)) + ir_export_obj = req.session.model("ir.exports") + ir_export_line_obj = req.session.model("ir.exports.line") + + field = ir_export_obj.read(export_id) + fields = ir_export_line_obj.read(field['export_fields']) + + name_list = {} + [name_list.update({field['name']: result.get(field['name'])}) for field in fields] + print ":name_list::\n\n\n\n\n:",name_list + return name_list + + def get_data(self, req, model, context=None): + + ids = [] + context = context or {} + fields_data = {} + proxy = req.session.model(model) + fields = self.fields_get(req, model) + if not ids: + f1 = proxy.fields_view_get(False, 'tree', context)['fields'] + f2 = proxy.fields_view_get(False, 'form', context)['fields'] + + fields = dict(f1) + fields.update(f2) + + def rec(fields): + _fields = {'id': 'ID' , '.id': 'Database ID' } + def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2): + fields_order = fields.keys() + fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) + + for field in fields_order: + fields_data[prefix_node+field] = fields[field] + if prefix_node: + fields_data[prefix_node + field]['string'] = '%s%s' % (prefix_value, fields_data[prefix_node + field]['string']) + st_name = fields[field]['string'] or field + _fields[prefix_node+field] = st_name + if fields[field].get('relation', False) and level>0: + fields2 = self.fields_get(req, fields[field]['relation']) + model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1) + model_populate(fields) + + return _fields + + return rec(fields) + diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 7b1137ac6ae..06ed5eacaa6 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -54,21 +54,35 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $("#ExistsExportList").show(); } else{ - this.rpc("/base_export/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){ - if(export_list.length){ - $("#ExistsExportList").append(QWeb.render('Exists.ExportList', {'existing_exports':export_list})); - $('#delete_export_list').click(function(){ - select_exp = $("#saved_export_list option:selected") - if (select_exp.val()){ - self.rpc("/base_export/export/delete_export", {"export_id": parseInt(select_exp.val())}, {}); - select_exp.remove(); - if($("#saved_export_list option").length <= 1){ + this.rpc("/base_export/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){ + if(export_list.length){ + $("#ExistsExportList").append(QWeb.render('Exists.ExportList', {'existing_exports':export_list})); + $("#saved_export_list").change(function(){ + $("#fields_list option").remove(); + export_id = $("#saved_export_list option:selected").val(); + if (export_id){ + self.rpc("/base_export/export/namelist", {"model": self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field); + } + }); + $('#delete_export_list').click(function(){ + select_exp = $("#saved_export_list option:selected") + if (select_exp.val()){ + self.rpc("/base_export/export/delete_export", {"export_id": parseInt(select_exp.val())}, {}); + select_exp.remove(); + if($("#saved_export_list option").length <= 1){ $("#ExistsExportList").hide(); - } - } - }); - } - }); + } + } + }); + } + }); + } + }, + + do_load_export_field: function(field_list){ + var export_node = $("#fields_list"); + for (var key in field_list) { + export_node.append(new Option(field_list[key], key)); } }, From 5a09e97754228fa8c2f9ed337c6f7951a962d7d5 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 18 Jul 2011 11:54:59 +0530 Subject: [PATCH 064/167] [IMP] imporve display export button in list and form view. bzr revid: ysa@tinyerp.com-20110718062459-2kf2z0zmgoes4ied --- addons/base/static/src/js/views.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 5efe27c7e21..07f1ce406f1 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -157,16 +157,6 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ self.on_controller_inited(view_type, controller); }); this.views[view_type].controller = controller; - if(this.flags && this.flags.sidebar) { - if(this.active_view == 'list' || this.active_view == 'form') { - this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) - this.$element.find('#exportview').click(function(ev) { - var export_view = new openerp.base_export.Export(self.session, self.dataset, self.views); - export_view.start(false); - ev.preventDefault(); - }); - } - } } @@ -193,6 +183,20 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ } } } + if(this.flags && this.flags.sidebar) { + if(this.$element.find('#exportview')){ + this.$element.find('#exportview').remove() + } + if(this.active_view == 'list' || this.active_view == 'form') { + console.log("this.views[this.active_view].controller.$element::",this.views[this.active_view].controller.$element) + this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) + this.$element.find('#exportview').click(function(ev) { + var export_view = new openerp.base_export.Export(self.session, self.dataset, self.views); + export_view.start(false); + ev.preventDefault(); + }); + } + } return view_promise; }, /** From 530f4361863e01162f60a0549cbcf5cc568d694d Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 18 Jul 2011 12:05:25 +0530 Subject: [PATCH 065/167] Remove console log. bzr revid: ysa@tinyerp.com-20110718063525-0gsycc588oqmefzi --- addons/base/static/src/js/views.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 07f1ce406f1..3c566d64145 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -188,7 +188,6 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ this.$element.find('#exportview').remove() } if(this.active_view == 'list' || this.active_view == 'form') { - console.log("this.views[this.active_view].controller.$element::",this.views[this.active_view].controller.$element) this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) this.$element.find('#exportview').click(function(ev) { var export_view = new openerp.base_export.Export(self.session, self.dataset, self.views); From f146e2a85e9a41c95684522a19da9028d33efa06 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 18 Jul 2011 18:19:40 +0530 Subject: [PATCH 066/167] [IMP] add on_click_export_data method for export data in csv file. bzr revid: ysa@tinyerp.com-20110718124940-kbxbqz90buuef93d --- addons/base_export/controllers/main.py | 41 +++++++++++++++++-- .../base_export/static/src/js/base_export.js | 23 ++++++++++- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index 89a1d8be6d8..38964111e2a 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -1,5 +1,7 @@ from base.controllers.main import View import openerpweb +import StringIO +import csv class Export(View): _cp_path = "/base_export/export" @@ -89,7 +91,6 @@ class Export(View): return name_list def get_data(self, req, model, context=None): - ids = [] context = context or {} fields_data = {} @@ -118,8 +119,42 @@ class Export(View): fields2 = self.fields_get(req, fields[field]['relation']) model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1) model_populate(fields) - return _fields - return rec(fields) + def export_csv(self, req, fields, result): + fp = StringIO.StringIO() + writer = csv.writer(fp, quoting=csv.QUOTE_ALL) + + writer.writerow(fields) + + for data in result: + row = [] + for d in data: + if isinstance(d, basestring): + d = d.replace('\n',' ').replace('\t',' ') + try: + d = d.encode('utf-8') + except: + pass + if d is False: d = None + row.append(d) + writer.writerow(row) + + fp.seek(0) + data = fp.read() + fp.close() + return data + + @openerpweb.jsonrequest + def export_data(self, req, model, fields, ids, domain, import_compat=False, context=None): + context = req.session.eval_context(req.context) + modle_obj = req.session.model(model) + ids = ids or modle_obj.search(domain, context=context) + + field = fields.keys() + result = modle_obj.export_data(ids, field , context).get('datas',[]) + + if not import_compat: + field = fields.values() + return self.export_csv(req, field, result) diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 06ed5eacaa6..07ca3ef8b1f 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -24,7 +24,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.close(); }, "Export To File" : function() { - self.get_fields(); + self.on_click_export_data(); } }, close: function(event, ui){ self.close();} @@ -284,10 +284,29 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ export_field.push(jQuery(this).val()); }); if (! export_field.length){ - alert('Please select fields to export...'); + alert('Please select fields to save export list...'); } return export_field; }, + on_click_export_data: function(){ + var self = this; + var export_field = {}; + var flag = true; + $("#fields_list option").each(function(){ + export_field[jQuery(this).val()] = jQuery(this).text(); + flag = false; + }); + if (flag){ + alert('Please select fields to export...'); + return; + } + + import_comp = $("#import_compat option:selected").val() + self.rpc("/base_export/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp)}, function(data){ + window.location="data:text/csv;charset=utf8," + encodeURIComponent(data) + self.close(); + }); + }, close: function() { jQuery(this.$dialog).remove(); From 001b539ee8c856b1052a23f73c3ba76c9b0bd7cb Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 19 Jul 2011 12:00:41 +0530 Subject: [PATCH 067/167] [FIX] fix problem. bzr revid: ysa@tinyerp.com-20110719063041-rwfcflad0vb91s12 --- addons/base/static/src/js/views.js | 2 +- addons/base_export/static/src/js/base_export.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index fa00607a68a..ce53db4c7b3 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -187,7 +187,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ if(this.active_view == 'list' || this.active_view == 'form') { this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) this.$element.find('#exportview').click(function(ev) { - var export_view = new openerp.base_export.Export(self.session, self.dataset, self.views); + var export_view = new openerp.base_export.Export(self, self.dataset); export_view.start(false); ev.preventDefault(); }); diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 07ca3ef8b1f..baf1b8d2dac 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -3,8 +3,8 @@ QWeb.add_template('/base_export/static/src/xml/base_export.xml'); openerp.base.views.add('export', 'openerp.base_export.Export'); openerp.base_export.Export = openerp.base.Dialog.extend({ - init: function(session, dataset, views){ - this._super(session); + init: function(parent, dataset){ + this._super(parent); this.dataset = dataset this.selected_fields = {}; }, From 700cdb0d91a5e02d142e006517f163efd819df21 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 19 Jul 2011 17:35:02 +0530 Subject: [PATCH 068/167] [FIX] Some mnor changes. bzr revid: noz@tinyerp.com-20110719120502-zu2zo20tlkbiylnf --- addons/base/static/src/js/chrome.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 06fb0d6e0d2..10e398b26bf 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -688,8 +688,8 @@ openerp.base.Loading = openerp.base.Controller.extend({ }); openerp.base.Database = openerp.base.Controller.extend({ - init: function(session, element_id, option_id) { - this._super(session, element_id); + init: function(parent, element_id, option_id) { + this._super(parent, element_id); this.option_id = option_id; this.$option_id = $('#' + option_id); this.$option_id.html(''); From dd8e7dd165f82798cbfe7ef4fe7878694829db05 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 19 Jul 2011 18:02:09 +0530 Subject: [PATCH 069/167] [IMP] implement onchange method of exoprt type field and change the tree structure of export fields. bzr revid: ysa@tinyerp.com-20110719123209-kvuqo2s4y57zx3br --- addons/base/static/src/js/views.js | 2 +- addons/base_export/controllers/main.py | 103 ++++++++++++++---- .../base_export/static/src/js/base_export.js | 22 +++- 3 files changed, 101 insertions(+), 26 deletions(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index ce53db4c7b3..03056709043 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -187,7 +187,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ if(this.active_view == 'list' || this.active_view == 'form') { this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) this.$element.find('#exportview').click(function(ev) { - var export_view = new openerp.base_export.Export(self, self.dataset); + var export_view = new openerp.base_export.Export(self, self.dataset, self.views); export_view.start(false); ev.preventDefault(); }); diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index 38964111e2a..ef87e51f59a 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -2,6 +2,47 @@ from base.controllers.main import View import openerpweb import StringIO import csv +import xml.dom.minidom + +def node_attributes(node): + attrs = node.attributes + + if not attrs: + return {} + # localName can be a unicode string, we're using attribute names as + # **kwargs keys and python-level kwargs don't take unicode keys kindly + # (they blow up) so we need to ensure all keys are ``str`` + return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue) + for i in range(attrs.length)]) + +def _fields_get_all(req, model, views, context=None): + + if context is None: + context = {} + + def parse(root, fields): + for node in root.childNodes: + if node.nodeName in ('form', 'notebook', 'page', 'group', 'tree', 'hpaned', 'vpaned'): + parse(node, fields) + elif node.nodeName=='field': + attrs = node_attributes(node) + name = attrs['name'] + fields[name].update(attrs) + return fields + + def get_view_fields(view): + return parse( + xml.dom.minidom.parseString(view['arch'].encode('utf-8')).documentElement, + view['fields']) + + model_obj = req.session.model(model) + tree_view = model_obj.fields_view_get(views.get('tree', False), 'tree', context) + form_view = model_obj.fields_view_get(views.get('form', False), 'form', context) + fields = {} + fields.update(get_view_fields(tree_view)) + fields.update(get_view_fields(form_view)) + return fields + class Export(View): _cp_path = "/base_export/export" @@ -9,42 +50,60 @@ class Export(View): def fields_get(self, req, model): Model = req.session.model(model) fields = Model.fields_get(False, req.session.eval_context(req.context)) - fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) return fields @openerpweb.jsonrequest - def get_fields(self, req, model, prefix='', field_parent=None, name= ''): - fields = self.fields_get(req, model) + def get_fields(self, req, model, prefix='', name= '', field_parent=None, import_compat=False, views_id={}): + fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context)) + if field_parent and import_compat: + fields = {} + fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) records = [] - for key, value in fields.items(): + fields_order = fields.keys() + fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) + for index, field in enumerate(fields_order): + value = fields[field] record = {} + if import_compat and value.get('readonly', False): + ok = False + for sl in value.get('states', {}).values(): + for s in sl: + ok = ok or (s==['readonly',False]) + if not ok: continue - id = prefix + (prefix and '/'or '') + key + id = prefix + (prefix and '/'or '') + field nm = name + (name and '/' or '') + value['string'] + record.update(id=id, string= nm, action='javascript: void(0)', target=None, icon=None, children=[]) records.append(record) - if value.get('relation', False): - ref = value.pop('relation') - cfields = self.fields_get(req, ref) - if (value['type'] == 'many2many'): - record['children'] = [] - record['params'] = {'model': ref, 'prefix': id, 'name': nm} + if len(nm.split('/')) < 3 and value.get('relation', False): + if import_compat: + ref = value.pop('relation') + cfields = self.fields_get(req, ref) + if (value['type'] == 'many2many'): + record['children'] = [] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} - elif (value['type'] == 'many2one') or (value['type'] == 'many2many'): - cfields_order = cfields.keys() - cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) - children = [] - for j, fld in enumerate(cfields_order): - cid = id + '/' + fld - cid = cid.replace(' ', '_') - children.append(cid) - record['children'] = children or [] - record['params'] = {'model': ref, 'prefix': id, 'name': nm} + elif value['type'] == 'many2one': + record['children'] = [id + '/id', id + '/.id'] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} + else: + cfields_order = cfields.keys() + cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) + children = [] + for j, fld in enumerate(cfields_order): + cid = id + '/' + fld + cid = cid.replace(' ', '_') + children.append(cid) + record['children'] = children or [] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} else: + ref = value.pop('relation') + cfields = self.fields_get(req, ref) cfields_order = cfields.keys() cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) children = [] @@ -102,6 +161,7 @@ class Export(View): fields = dict(f1) fields.update(f2) + fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) def rec(fields): _fields = {'id': 'ID' , '.id': 'Database ID' } @@ -117,6 +177,7 @@ class Export(View): _fields[prefix_node+field] = st_name if fields[field].get('relation', False) and level>0: fields2 = self.fields_get(req, fields[field]['relation']) + fields2.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1) model_populate(fields) return _fields diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index baf1b8d2dac..11a9510ae1b 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -3,10 +3,15 @@ QWeb.add_template('/base_export/static/src/xml/base_export.xml'); openerp.base.views.add('export', 'openerp.base_export.Export'); openerp.base_export.Export = openerp.base.Dialog.extend({ - init: function(parent, dataset){ + init: function(parent, dataset, views){ this._super(parent); this.dataset = dataset + this.views = views this.selected_fields = {}; + this.views_id = {}; + for (var key in this.views) { + this.views_id[key] = this.views[key].view_id + } }, start: function() { @@ -44,8 +49,16 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $('#export_new_list').click(function(){ self.on_show_save_list(); }); - this.rpc("/base_export/export/get_fields", {"model": this.dataset.model}, this.on_show_data); - + import_comp = $("#import_compat option:selected").val() + this.rpc("/base_export/export/get_fields", {"model": this.dataset.model,"import_compat":parseInt(import_comp), "views_id": this.views_id}, this.on_show_data); + $("#import_compat").change(function(){ + $("#fields_list option").remove(); + $("tr[id^='treerow-']").remove(); + import_comp = $("#import_compat option:selected").val(); + if(import_comp){ + self.rpc("/base_export/export/get_fields", {"model": self.dataset.model,"import_compat":parseInt(import_comp), "views_id": this.views_id}, self.on_show_data); + } + }); }, on_show_exists_export_list: function(){ @@ -157,7 +170,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ if (is_loaded == 0) { if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { if (model){ - self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "field_parent" : self.field_id, "name": name}, function (results) { + import_comp = $("#import_compat option:selected").val() + self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "name": name, "field_parent" : self.field_id, "import_compat":parseInt(import_comp), "views_id": this.views_id}, function (results) { self.on_show_data(results); }); } From c1546ac368be928f990f261263eb163cae1fe72e Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 19 Jul 2011 18:34:23 +0530 Subject: [PATCH 070/167] [IMP] if export type import compatible then all childs not display in m2o and o2m display all childs. bzr revid: ysa@tinyerp.com-20110719130423-cs8nexdnyqa42ili --- addons/base_export/controllers/main.py | 16 ++++++++++------ addons/base_export/static/src/js/base_export.js | 9 ++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index ef87e51f59a..dec0829b83b 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -53,15 +53,21 @@ class Export(View): return fields @openerpweb.jsonrequest - def get_fields(self, req, model, prefix='', name= '', field_parent=None, import_compat=False, views_id={}): - fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context)) + def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}): + import_compat = params.get("import_compat", False) + views_id = params.get("views_id", {}) - if field_parent and import_compat: + fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context)) + field_parent_type = params.get("parent_field_type",False) + + if import_compat and field_parent_type and field_parent_type == "many2one": fields = {} + fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) records = [] fields_order = fields.keys() fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) + for index, field in enumerate(fields_order): value = fields[field] record = {} @@ -74,9 +80,8 @@ class Export(View): id = prefix + (prefix and '/'or '') + field nm = name + (name and '/' or '') + value['string'] - record.update(id=id, string= nm, action='javascript: void(0)', - target=None, icon=None, children=[]) + target=None, icon=None, children=[], field_type=value.get('type',False)) records.append(record) if len(nm.split('/')) < 3 and value.get('relation', False): @@ -146,7 +151,6 @@ class Export(View): name_list = {} [name_list.update({field['name']: result.get(field['name'])}) for field in fields] - print ":name_list::\n\n\n\n\n:",name_list return name_list def get_data(self, req, model, context=None): diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 11a9510ae1b..c4f80994c8f 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -50,13 +50,15 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.on_show_save_list(); }); import_comp = $("#import_compat option:selected").val() - this.rpc("/base_export/export/get_fields", {"model": this.dataset.model,"import_compat":parseInt(import_comp), "views_id": this.views_id}, this.on_show_data); + var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} + this.rpc("/base_export/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data); $("#import_compat").change(function(){ $("#fields_list option").remove(); $("tr[id^='treerow-']").remove(); import_comp = $("#import_compat option:selected").val(); if(import_comp){ - self.rpc("/base_export/export/get_fields", {"model": self.dataset.model,"import_compat":parseInt(import_comp), "views_id": this.views_id}, self.on_show_data); + var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} + self.rpc("/base_export/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data); } }); }, @@ -171,7 +173,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { if (model){ import_comp = $("#import_compat option:selected").val() - self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "name": name, "field_parent" : self.field_id, "import_compat":parseInt(import_comp), "views_id": this.views_id}, function (results) { + var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']} + self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "name": name, "field_parent" : self.field_id, "params":params}, function (results) { self.on_show_data(results); }); } From 0bf100cb537f5eee493379b92968a40a7206d784 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 21 Jul 2011 10:42:32 +0530 Subject: [PATCH 071/167] [IMP] Improve code, css and template. add image file. bzr revid: ysa@tinyerp.com-20110721051232-welyq15eoo9rhmb4 --- addons/base_export/controllers/main.py | 2 +- .../static/src/css/base_export.css | 69 ++++++++++-------- .../base_export/static/src/img/collapse.gif | Bin 0 -> 80 bytes addons/base_export/static/src/img/expand.gif | Bin 0 -> 81 bytes addons/base_export/static/src/img/header.gif | Bin 0 -> 182 bytes .../base_export/static/src/js/base_export.js | 22 +++--- .../static/src/xml/base_export.xml | 46 ++++++------ 7 files changed, 72 insertions(+), 67 deletions(-) create mode 100644 addons/base_export/static/src/img/collapse.gif create mode 100644 addons/base_export/static/src/img/expand.gif create mode 100644 addons/base_export/static/src/img/header.gif diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py index dec0829b83b..9c09d8f3749 100644 --- a/addons/base_export/controllers/main.py +++ b/addons/base_export/controllers/main.py @@ -221,5 +221,5 @@ class Export(View): result = modle_obj.export_data(ids, field , context).get('datas',[]) if not import_compat: - field = fields.values() + field = [val.strip() for val in fields.values()] return self.export_csv(req, field, result) diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base_export/static/src/css/base_export.css index 61ddb47451b..65dbbdbf7c1 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base_export/static/src/css/base_export.css @@ -1,34 +1,27 @@ -.row { +.row tr{ background-color: #FFFFFF; + font-size: 0.9em; + height: 22px; } -.row:hover { +.row:hover{ background-color: #F3F3F3; - color : #4F4F4F; + color : blue; } -.row.selected{ - background-color: #E0E0E0; - -} .fields-selector-export { width: 100%; height: 400px; } -.fields-selector-import { - width: 100%; - height: 300px; -} - .fields-selector-left { width: 45%; } -td.fields-selector-left div#fields_left { +div#left_field_panel { overflow: scroll; width: 100%; - height: 100%; + height: 400px; border: solid #999999 1px; } @@ -36,30 +29,44 @@ td.fields-selector-left div#fields_left { width: 15%; } -.fields-selector-center td { - padding: 2px 3px; -} - -.fields-selector-center a.button-a { - float: none; -} - .fields-selector-right { width: 45%; + height: 400px; } -.fields-selector-export select, -.fields-selector-import select { +.fields-selector-export select{ width: 100%; height: 100%; } -.fields-selector-export button, -.fields-selector-import button { - width: 100%; - margin: 5px 0; +.tree_header{ + border: 0.5px solid #E3E3E3; + text-align: left; + white-space: nowrap; + padding: 4px 5px; + background: url(/base_export/static/src/img/header.gif); } -td.side_spacing { - padding: 5px 5px 0px; -} \ No newline at end of file + +table.tree-grid{ + border: 1px solid #E3E3E3; + text-align: left; + white-space: nowrap; + background-color:#E3E3E3; + border-collapse: collapse; + width: 100%; +} + +table.tree-grid a:hover { + color: blue; + border: none; +} + +table.tree-grid a { + color: #5F5C5C; + border: none; +} + +.button { + border: 1px solid #006; +} diff --git a/addons/base_export/static/src/img/collapse.gif b/addons/base_export/static/src/img/collapse.gif new file mode 100644 index 0000000000000000000000000000000000000000..759e72ebcfe18bc1bc714b6451c301b12a1f27d5 GIT binary patch literal 80 zcmZ?wbhEHb6krfwSjfZx1Zin$|G_}ER?(XjE>+9+1>F4L?<>lq$z>(a_M) z&d$!w&CSfr%>V!YEC2ui00IC!000F$U=RqxFc3sh7{+lRNRlYZvM@~3IL`AxkVr%# knM^2@O2uNiTrikSMx)tmIGj$$!|i&%;IMd14u=2$JFIAN1ONa4 literal 0 HcmV?d00001 diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index c4f80994c8f..4ef196c2d65 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -35,6 +35,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ close: function(event, ui){ self.close();} }); this.on_show_exists_export_list(); + jQuery(this.$dialog).removeClass('ui-dialog-content ui-widget-content'); $('#add_field').click(function(){ for (var key in self.selected_fields) { self.add_field(key, self.selected_fields[key]) @@ -52,9 +53,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ import_comp = $("#import_compat option:selected").val() var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} this.rpc("/base_export/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data); + $("#import_compat").change(function(){ $("#fields_list option").remove(); - $("tr[id^='treerow-']").remove(); + $("#field-tree-structure").remove(); import_comp = $("#import_compat option:selected").val(); if(import_comp){ var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} @@ -170,7 +172,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }); if (is_loaded == 0) { - if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { + if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base_export/static/src/img/expand.gif') { if (model){ import_comp = $("#import_compat option:selected").val() var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']} @@ -193,8 +195,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ var self = this; var current_tr = $("tr[id='treerow-" + self.field_id + "']"); if (current_tr.length >= 1){ - current_tr.find('img').attr('src','/base/static/src/img/collapse.gif'); - current_tr.after(QWeb.render('ExportTreeView-Secondary', {'fields': result})); + current_tr.find('img').attr('src','/base_export/static/src/img/collapse.gif'); + current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result})); } else{ $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); @@ -215,7 +217,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ arrow = {left: 37, up: 38, right: 39, down: 40 }; switch (keyCode) { case arrow.left: - if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ + if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){ self.on_click(this.id, result); } break; @@ -227,7 +229,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $(elem).prev().find('a').focus(); break; case arrow.right: - if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ + if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/expand.gif'){ self.on_click(this.id, result); } break; @@ -266,10 +268,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ showcontent: function (id, flag) { var first_child = $("tr[id='treerow-" + id + "']").find('img') if (flag) { - first_child.attr('src', '/base/static/src/img/expand.gif'); + first_child.attr('src', '/base_export/static/src/img/expand.gif'); } else { - first_child.attr('src', '/base/static/src/img/collapse.gif'); + first_child.attr('src', '/base_export/static/src/img/collapse.gif'); } var child_field = $("tr[id^='treerow-" + id +"/']") var child_len = (id.split("/")).length + 1 @@ -279,8 +281,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } else { if(child_len == (child_field[i].id.split("/")).length){ - if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ - jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif') + if( jQuery(child_field[i]).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){ + jQuery(child_field[i]).find('img').attr('src', '/base_export/static/src/img/expand.gif') } $(child_field[i]).show(); } diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index c5459ad888b..f8b41c06d77 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -5,20 +5,20 @@ -
@@ -115,9 +116,24 @@
+ +
+
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From a0a95f2a6ea94f56e678602ae09eebbc8bd04cba Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Fri, 22 Jul 2011 18:31:57 +0530 Subject: [PATCH 081/167] [IMP]Remove style from selection box. bzr revid: kch@tinyerp.com-20110722130157-ijq40kghbk16io4m --- addons/base/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index fee6a07281b..ad55f2f90a5 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -951,7 +951,7 @@
+ This wizard will export all data that matches the current search criteria to a CSV file. You can export all data or only the fields that can be reimported after modification.
+ + + + + + + + + + + + + + + + + + + + + diff --git a/addons/base_export/__init__.py b/addons/base_export/__init__.py deleted file mode 100644 index 4a64491e6bb..00000000000 --- a/addons/base_export/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/python -import controllers diff --git a/addons/base_export/__openerp__.py b/addons/base_export/__openerp__.py deleted file mode 100644 index 53347c57d04..00000000000 --- a/addons/base_export/__openerp__.py +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "Base Export", - "version": "2.0", - "depends": ['base'], - "js": [ - 'static/src/js/base_export.js' - ], - "css": ["static/src/css/base_export.css"], - 'active': True -} diff --git a/addons/base_export/controllers/__init__.py b/addons/base_export/controllers/__init__.py deleted file mode 100644 index 039d9715fab..00000000000 --- a/addons/base_export/controllers/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import main \ No newline at end of file diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py deleted file mode 100644 index 3aa73147ebb..00000000000 --- a/addons/base_export/controllers/main.py +++ /dev/null @@ -1,260 +0,0 @@ -from base.controllers.main import View -import openerpweb -import StringIO -import csv -import xml.dom.minidom -import re - -def export_csv(fields, result): - fp = StringIO.StringIO() - writer = csv.writer(fp, quoting=csv.QUOTE_ALL) - - writer.writerow(fields) - - for data in result: - row = [] - for d in data: - if isinstance(d, basestring): - d = d.replace('\n',' ').replace('\t',' ') - try: - d = d.encode('utf-8') - except: - pass - if d is False: d = None - row.append(d) - writer.writerow(row) - - fp.seek(0) - data = fp.read() - fp.close() - return data - -def export_xls(fieldnames, table): - try: - import xlwt - except ImportError: - common.error(_('Import Error.'), _('Please install xlwt library to export to MS Excel.')) - - workbook = xlwt.Workbook() - worksheet = workbook.add_sheet('Sheet 1') - - for i, fieldname in enumerate(fieldnames): - worksheet.write(0, i, str(fieldname)) - worksheet.col(i).width = 8000 # around 220 pixels - - style = xlwt.easyxf('align: wrap yes') - - for row_index, row in enumerate(table): - for cell_index, cell_value in enumerate(row): - cell_value = str(cell_value) - cell_value = re.sub("\r", " ", cell_value) - worksheet.write(row_index + 1, cell_index, cell_value, style) - - - fp = StringIO.StringIO() - workbook.save(fp) - fp.seek(0) - data = fp.read() - fp.close() - #return data.decode('ISO-8859-1') - return unicode(data, 'utf-8', 'replace') - -def node_attributes(node): - attrs = node.attributes - - if not attrs: - return {} - # localName can be a unicode string, we're using attribute names as - # **kwargs keys and python-level kwargs don't take unicode keys kindly - # (they blow up) so we need to ensure all keys are ``str`` - return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue) - for i in range(attrs.length)]) - -def _fields_get_all(req, model, views, context=None): - - if context is None: - context = {} - - def parse(root, fields): - for node in root.childNodes: - if node.nodeName in ('form', 'notebook', 'page', 'group', 'tree', 'hpaned', 'vpaned'): - parse(node, fields) - elif node.nodeName=='field': - attrs = node_attributes(node) - name = attrs['name'] - fields[name].update(attrs) - return fields - - def get_view_fields(view): - return parse( - xml.dom.minidom.parseString(view['arch'].encode('utf-8')).documentElement, - view['fields']) - - model_obj = req.session.model(model) - tree_view = model_obj.fields_view_get(views.get('tree', False), 'tree', context) - form_view = model_obj.fields_view_get(views.get('form', False), 'form', context) - fields = {} - fields.update(get_view_fields(tree_view)) - fields.update(get_view_fields(form_view)) - return fields - - -class Export(View): - _cp_path = "/base_export/export" - - def fields_get(self, req, model): - Model = req.session.model(model) - fields = Model.fields_get(False, req.session.eval_context(req.context)) - return fields - - @openerpweb.jsonrequest - def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}): - import_compat = params.get("import_compat", False) - views_id = params.get("views_id", {}) - - fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context)) - field_parent_type = params.get("parent_field_type",False) - - if import_compat and field_parent_type and field_parent_type == "many2one": - fields = {} - - fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) - records = [] - fields_order = fields.keys() - fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) - - for index, field in enumerate(fields_order): - value = fields[field] - record = {} - if import_compat and value.get('readonly', False): - ok = False - for sl in value.get('states', {}).values(): - for s in sl: - ok = ok or (s==['readonly',False]) - if not ok: continue - - id = prefix + (prefix and '/'or '') + field - nm = name + (name and '/' or '') + value['string'] - record.update(id=id, string= nm, action='javascript: void(0)', - target=None, icon=None, children=[], field_type=value.get('type',False), required=value.get('required', False)) - records.append(record) - - if len(nm.split('/')) < 3 and value.get('relation', False): - if import_compat: - ref = value.pop('relation') - cfields = self.fields_get(req, ref) - if (value['type'] == 'many2many'): - record['children'] = [] - record['params'] = {'model': ref, 'prefix': id, 'name': nm} - - elif value['type'] == 'many2one': - record['children'] = [id + '/id', id + '/.id'] - record['params'] = {'model': ref, 'prefix': id, 'name': nm} - - else: - cfields_order = cfields.keys() - cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) - children = [] - for j, fld in enumerate(cfields_order): - cid = id + '/' + fld - cid = cid.replace(' ', '_') - children.append(cid) - record['children'] = children or [] - record['params'] = {'model': ref, 'prefix': id, 'name': nm} - else: - ref = value.pop('relation') - cfields = self.fields_get(req, ref) - cfields_order = cfields.keys() - cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) - children = [] - for j, fld in enumerate(cfields_order): - cid = id + '/' + fld - cid = cid.replace(' ', '_') - children.append(cid) - record['children'] = children or [] - record['params'] = {'model': ref, 'prefix': id, 'name': nm} - - records.reverse() - return records - - @openerpweb.jsonrequest - def save_export_lists(self, req, name, model, field_list): - result = {'resource':model, 'name':name, 'export_fields': []} - for field in field_list: - result['export_fields'].append((0, 0, {'name': field})) - return req.session.model("ir.exports").create(result, req.session.eval_context(req.context)) - - @openerpweb.jsonrequest - def exist_export_lists(self, req, model): - export_model = req.session.model("ir.exports") - return export_model.read(export_model.search([('resource', '=', model)]), ['name']) - - @openerpweb.jsonrequest - def delete_export(self, req, export_id): - req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context)) - return True - - @openerpweb.jsonrequest - def namelist(self,req, model, export_id): - - result = self.get_data(req, model, req.session.eval_context(req.context)) - ir_export_obj = req.session.model("ir.exports") - ir_export_line_obj = req.session.model("ir.exports.line") - - field = ir_export_obj.read(export_id) - fields = ir_export_line_obj.read(field['export_fields']) - - name_list = {} - [name_list.update({field['name']: result.get(field['name'])}) for field in fields] - return name_list - - def get_data(self, req, model, context=None): - ids = [] - context = context or {} - fields_data = {} - proxy = req.session.model(model) - fields = self.fields_get(req, model) - if not ids: - f1 = proxy.fields_view_get(False, 'tree', context)['fields'] - f2 = proxy.fields_view_get(False, 'form', context)['fields'] - - fields = dict(f1) - fields.update(f2) - fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) - - def rec(fields): - _fields = {'id': 'ID' , '.id': 'Database ID' } - def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2): - fields_order = fields.keys() - fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) - - for field in fields_order: - fields_data[prefix_node+field] = fields[field] - if prefix_node: - fields_data[prefix_node + field]['string'] = '%s%s' % (prefix_value, fields_data[prefix_node + field]['string']) - st_name = fields[field]['string'] or field - _fields[prefix_node+field] = st_name - if fields[field].get('relation', False) and level>0: - fields2 = self.fields_get(req, fields[field]['relation']) - fields2.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) - model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1) - model_populate(fields) - return _fields - return rec(fields) - - @openerpweb.jsonrequest - def export_data(self, req, model, fields, ids, domain, import_compat=False, export_format="csv", context=None): - context = req.session.eval_context(req.context) - modle_obj = req.session.model(model) - ids = ids or modle_obj.search(domain, context=context) - - field = fields.keys() - result = modle_obj.export_data(ids, field , context).get('datas',[]) - - if not import_compat: - field = [val.strip() for val in fields.values()] - - if export_format == 'xls': - return export_xls(field, result) - else: - return export_csv(field, result) diff --git a/addons/base_export/static/src/img/collapse.gif b/addons/base_export/static/src/img/collapse.gif deleted file mode 100644 index 759e72ebcfe18bc1bc714b6451c301b12a1f27d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmZ?wbhEHb6krfwSjfZx1Zin$|G_} - - - Export - - - -
- @@ -30,7 +30,7 @@
- +
@@ -41,40 +41,30 @@ - - @@ -85,10 +75,16 @@ +
Available fields
-
- - - - - -
Name
- -
-
-
+
+
- +
- +
- +
- +
+
+ + +
Name
+ +
- +
@@ -98,12 +94,12 @@ From 58c601ab11adf7d7fd4d6617168844fce924ee86 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Thu, 21 Jul 2011 14:14:20 +0530 Subject: [PATCH 072/167] [IMP]Improve code for bind ctrl key for multiple selection. bzr revid: kch@tinyerp.com-20110721084420-d30pnissxcxude0a --- .../static/src/css/base_export.css | 4 + .../base_export/static/src/js/base_export.js | 135 ++++++++++-------- 2 files changed, 81 insertions(+), 58 deletions(-) diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base_export/static/src/css/base_export.css index 65dbbdbf7c1..68a2ec202af 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base_export/static/src/css/base_export.css @@ -4,6 +4,10 @@ height: 22px; } +tr.ui-selected td { + background-color: #CCCCCC; +} + .row:hover{ background-color: #F3F3F3; color : blue; diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 4ef196c2d65..2fd236cd73d 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -7,7 +7,6 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ this._super(parent); this.dataset = dataset this.views = views - this.selected_fields = {}; this.views_id = {}; for (var key in this.views) { this.views_id[key] = this.views[key].view_id @@ -37,8 +36,14 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ this.on_show_exists_export_list(); jQuery(this.$dialog).removeClass('ui-dialog-content ui-widget-content'); $('#add_field').click(function(){ - for (var key in self.selected_fields) { - self.add_field(key, self.selected_fields[key]) + if($("#field-tree-structure tr.ui-selected")){ + var fld = $("#field-tree-structure tr.ui-selected").find('a'); + for (var i=0;i Date: Thu, 21 Jul 2011 14:41:02 +0530 Subject: [PATCH 073/167] [IMP] improve css and template. bzr revid: ysa@tinyerp.com-20110721091102-2bf321qehu233jid --- addons/base_export/static/src/css/base_export.css | 9 +++++---- addons/base_export/static/src/js/base_export.js | 2 +- addons/base_export/static/src/xml/base_export.xml | 12 ++++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base_export/static/src/css/base_export.css index 68a2ec202af..198db30b5d0 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base_export/static/src/css/base_export.css @@ -1,6 +1,6 @@ .row tr{ background-color: #FFFFFF; - font-size: 0.9em; + font-size: 0.8em; height: 22px; } @@ -19,7 +19,7 @@ tr.ui-selected td { } .fields-selector-left { - width: 45%; + width: 50%; } div#left_field_panel { @@ -30,7 +30,7 @@ div#left_field_panel { } .fields-selector-center { - width: 15%; + width: 102px; } .fields-selector-right { @@ -71,6 +71,7 @@ table.tree-grid a { border: none; } -.button { +.button-export { border: 1px solid #006; + background-color: #F3F3F3; } diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 2fd236cd73d..b00da47e924 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -20,7 +20,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ self.dialog_title = "Export Data " self.open({ modal: true, - width: '50%', + width: '55%', height: 'auto', position: 'top', buttons : { diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml index f8b41c06d77..84bdf683529 100644 --- a/addons/base_export/static/src/xml/base_export.xml +++ b/addons/base_export/static/src/xml/base_export.xml @@ -1,7 +1,7 @@ \ No newline at end of file From 7b11b0d076667a41a326b6d58dbe25b913995484 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Fri, 22 Jul 2011 17:38:26 +0530 Subject: [PATCH 079/167] [IMP]Implement code for o2m field should not select. bzr revid: kch@tinyerp.com-20110722120826-uattcrxljouh9rx2 --- .../static/src/css/base_export.css | 4 ++ .../base_export/static/src/js/base_export.js | 44 ++++++++++++++----- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base_export/static/src/css/base_export.css index 431287ca471..485338b63e3 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base_export/static/src/css/base_export.css @@ -12,6 +12,10 @@ tr.ui-selected td { background-color: #D2D2FF; } +.readonlyfield{ + background-color: DarkGray; +} + .row:hover{ background-color: #F3F3F3; } diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base_export/static/src/js/base_export.js index 8814edc946b..566a6cf167c 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base_export/static/src/js/base_export.js @@ -207,6 +207,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } _.each(result, function(record) { + if(record.field_type == "one2many"){ + var o2m_fld = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + o2m_fld.addClass("readonlyfield"); + } if ((record.required == true) || record.required == "True"){ var required_fld = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); required_fld.addClass("requiredfield"); @@ -226,12 +230,16 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ if (this.rowIndex >=self.row_index){ for (i = (self.row_index-1); i < this.rowIndex; i++) { scnd_click = $("tr[id^='treerow-']")[i]; - $(scnd_click).addClass("ui-selected"); + if(!$(scnd_click).find('#tree-column').hasClass("readonlyfield")){ + $(scnd_click).addClass("ui-selected"); + } } }else{ for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) { scnd_click = $("tr[id^='treerow-']")[i]; - $(scnd_click).addClass("ui-selected"); + if(!$(scnd_click).find('#tree-column').hasClass("readonlyfield")){ + $(scnd_click).addClass("ui-selected"); + } } } } @@ -241,7 +249,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $("tr[id^='treerow-" + record.id + "']").keyup(function (e) { self.row_index = 0; }); - + var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + if ($(o2m_selection).hasClass("readonlyfield")){ + return false; + } var selected = $("tr.ui-selected"); if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)){ $(this).find('a').blur(); @@ -278,7 +289,9 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ while($(elem).prev().is(":visible") == false){ elem = $(elem).prev(); } - $(elem).prev().addClass("ui-selected"); + if(!$(elem).prev().find('#tree-column').hasClass("readonlyfield")){ + $(elem).prev().addClass("ui-selected"); + } $(elem).prev().find('a').focus(); break; case arrow.right: @@ -292,24 +305,31 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ while($(elem).next().is(":visible") == false){ elem = $(elem).next(); } - $(elem).next().addClass("ui-selected"); + if(!$(elem).next().find('#tree-column').hasClass("readonlyfield")){ + $(elem).next().addClass("ui-selected"); + } $(elem).next().find('a').focus(); break; } }); - $("tr[id^='treerow-" + record.id + "']").dblclick(function (e) { - var field_id = $(this).find("a").attr("id"); - if(field_id){ - self.add_field(field_id.split('-')[1], $(this).find("a").attr("string")) - } - }); + $("tr[id^='treerow-" + record.id + "']").dblclick(function (e) { + var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + if (! $(o2m_selection).hasClass("readonlyfield")){ + var field_id = $(this).find("a").attr("id"); + if(field_id){ + self.add_field(field_id.split('-')[1], $(this).find("a").attr("string")) + } + } + }); }); $('#fields_list').mouseover(function(event){ if(event.relatedTarget){ if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){ field_id = event.relatedTarget.attributes["id"]["value"] if (field_id && field_id.split("-")[0] == 'export'){ - self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]); + if(!$("tr[id^='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("readonlyfield")){ + self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]); + } } } } From 7ff6fafdaf7e665fd29ba6ba55bb76c3088e45ea Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 22 Jul 2011 18:22:14 +0530 Subject: [PATCH 080/167] [MOVE] move export related functionality base_export to base module. bzr revid: ysa@tinyerp.com-20110722125214-3lrqho65skbzokcy --- addons/base/controllers/main.py | 273 +++++++++++++++++- addons/base/static/src/base.html | 2 + .../static/src/css/export.css} | 2 +- addons/base/static/src/img/collapse.gif | Bin addons/base/static/src/img/expand.gif | Bin .../static/src/img/header.gif | Bin addons/base/static/src/js/base.js | 3 + .../static/src/js/export.js} | 38 ++- addons/base/static/src/js/views.js | 5 +- addons/base/static/src/xml/base.xml | 149 +++++++++- addons/base_export/__init__.py | 2 - addons/base_export/__openerp__.py | 10 - addons/base_export/controllers/__init__.py | 1 - addons/base_export/controllers/main.py | 260 ----------------- .../base_export/static/src/img/collapse.gif | Bin 80 -> 0 bytes addons/base_export/static/src/img/expand.gif | Bin 81 -> 0 bytes .../static/src/xml/base_export.xml | 143 --------- 17 files changed, 437 insertions(+), 451 deletions(-) rename addons/{base_export/static/src/css/base_export.css => base/static/src/css/export.css} (95%) mode change 100755 => 100644 addons/base/static/src/img/collapse.gif mode change 100755 => 100644 addons/base/static/src/img/expand.gif rename addons/{base_export => base}/static/src/img/header.gif (100%) rename addons/{base_export/static/src/js/base_export.js => base/static/src/js/export.js} (88%) delete mode 100644 addons/base_export/__init__.py delete mode 100644 addons/base_export/__openerp__.py delete mode 100644 addons/base_export/controllers/__init__.py delete mode 100644 addons/base_export/controllers/main.py delete mode 100644 addons/base_export/static/src/img/collapse.gif delete mode 100644 addons/base_export/static/src/img/expand.gif delete mode 100644 addons/base_export/static/src/xml/base_export.xml diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index da471499087..be1f103d6f9 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -10,6 +10,8 @@ import openerpweb.ast import openerpweb.nonliterals import cherrypy +import csv +import xml.dom.minidom # Should move to openerpweb.Xml2Json class Xml2Json: @@ -179,7 +181,7 @@ class Session(openerpweb.Controller): context, domain = eval_context_and_domain(req.session, openerpweb.nonliterals.CompoundContext(*(contexts or [])), openerpweb.nonliterals.CompoundDomain(*(domains or []))) - + group_by_sequence = [] for candidate in (group_by_seq or []): ctx = req.session.eval_context(candidate, context) @@ -190,7 +192,7 @@ class Session(openerpweb.Controller): group_by_sequence.append(group_by) else: group_by_sequence.extend(group_by) - + return { 'context': context, 'domain': domain, @@ -203,7 +205,7 @@ class Session(openerpweb.Controller): This method store an action object in the session object and returns an integer identifying that action. The method get_session_action() can be used to get back the action. - + :param the_action: The action to save in the session. :type the_action: anything :return: A key identifying the saved action. @@ -226,7 +228,7 @@ class Session(openerpweb.Controller): """ Gets back a previously saved action. This method can return None if the action was saved since too much time (this case should be handled in a smart way). - + :param key: The key given by save_session_action() :type key: integer :return: The saved action or None. @@ -361,7 +363,7 @@ class Menu(openerpweb.Controller): menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id'], context) menu_root = {'id': False, 'name': 'root', 'parent_id': [-1, '']} menu_items.append(menu_root) - + # make a tree using parent_id menu_items_map = dict((menu_item["id"], menu_item) for menu_item in menu_items) for menu_item in menu_items: @@ -468,7 +470,7 @@ class DataSet(openerpweb.Controller): record_map = dict((record['id'], record) for record in records) return [record_map[id] for id in ids if record_map.get(id)] - + @openerpweb.jsonrequest def load(self, req, model, id, fields): m = req.session.model(model) @@ -631,7 +633,7 @@ class View(openerpweb.Controller): except ValueError: # not a literal return openerpweb.nonliterals.Domain(session, domain) - + def parse_context(self, context, session): """ Parses an arbitrary string containing a context, transforms it to either a literal context or a :class:`openerpweb.nonliterals.Context` @@ -832,4 +834,259 @@ class Action(openerpweb.Controller): return clean_action(req.session.model('ir.actions.server').run( [action_id], req.session.eval_context(req.context)), req.session) -# +def export_csv(fields, result): + import StringIO + fp = StringIO.StringIO() + writer = csv.writer(fp, quoting=csv.QUOTE_ALL) + + writer.writerow(fields) + + for data in result: + row = [] + for d in data: + if isinstance(d, basestring): + d = d.replace('\n',' ').replace('\t',' ') + try: + d = d.encode('utf-8') + except: + pass + if d is False: d = None + row.append(d) + writer.writerow(row) + + fp.seek(0) + data = fp.read() + fp.close() + return data + +def export_xls(fieldnames, table): + import StringIO + try: + import xlwt + except ImportError: + common.error(_('Import Error.'), _('Please install xlwt library to export to MS Excel.')) + + workbook = xlwt.Workbook() + worksheet = workbook.add_sheet('Sheet 1') + + for i, fieldname in enumerate(fieldnames): + worksheet.write(0, i, str(fieldname)) + worksheet.col(i).width = 8000 # around 220 pixels + + style = xlwt.easyxf('align: wrap yes') + + for row_index, row in enumerate(table): + for cell_index, cell_value in enumerate(row): + cell_value = str(cell_value) + cell_value = re.sub("\r", " ", cell_value) + worksheet.write(row_index + 1, cell_index, cell_value, style) + + + fp = StringIO.StringIO() + workbook.save(fp) + fp.seek(0) + data = fp.read() + fp.close() + #return data.decode('ISO-8859-1') + return unicode(data, 'utf-8', 'replace') + +def node_attributes(node): + attrs = node.attributes + + if not attrs: + return {} + # localName can be a unicode string, we're using attribute names as + # **kwargs keys and python-level kwargs don't take unicode keys kindly + # (they blow up) so we need to ensure all keys are ``str`` + return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue) + for i in range(attrs.length)]) + +def _fields_get_all(req, model, views, context=None): + + if context is None: + context = {} + + def parse(root, fields): + for node in root.childNodes: + if node.nodeName in ('form', 'notebook', 'page', 'group', 'tree', 'hpaned', 'vpaned'): + parse(node, fields) + elif node.nodeName=='field': + attrs = node_attributes(node) + name = attrs['name'] + fields[name].update(attrs) + return fields + + def get_view_fields(view): + return parse( + xml.dom.minidom.parseString(view['arch'].encode('utf-8')).documentElement, + view['fields']) + + model_obj = req.session.model(model) + tree_view = model_obj.fields_view_get(views.get('tree', False), 'tree', context) + form_view = model_obj.fields_view_get(views.get('form', False), 'form', context) + fields = {} + fields.update(get_view_fields(tree_view)) + fields.update(get_view_fields(form_view)) + return fields + + +class Export(View): + _cp_path = "/base/export" + + def fields_get(self, req, model): + Model = req.session.model(model) + fields = Model.fields_get(False, req.session.eval_context(req.context)) + return fields + + @openerpweb.jsonrequest + def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}): + import_compat = params.get("import_compat", False) + views_id = params.get("views_id", {}) + + fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context)) + field_parent_type = params.get("parent_field_type",False) + + if import_compat and field_parent_type and field_parent_type == "many2one": + fields = {} + + fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) + records = [] + fields_order = fields.keys() + fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) + + for index, field in enumerate(fields_order): + value = fields[field] + record = {} + if import_compat and value.get('readonly', False): + ok = False + for sl in value.get('states', {}).values(): + for s in sl: + ok = ok or (s==['readonly',False]) + if not ok: continue + + id = prefix + (prefix and '/'or '') + field + nm = name + (name and '/' or '') + value['string'] + record.update(id=id, string= nm, action='javascript: void(0)', + target=None, icon=None, children=[], field_type=value.get('type',False), required=value.get('required', False)) + records.append(record) + + if len(nm.split('/')) < 3 and value.get('relation', False): + if import_compat: + ref = value.pop('relation') + cfields = self.fields_get(req, ref) + if (value['type'] == 'many2many'): + record['children'] = [] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} + + elif value['type'] == 'many2one': + record['children'] = [id + '/id', id + '/.id'] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} + + else: + cfields_order = cfields.keys() + cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) + children = [] + for j, fld in enumerate(cfields_order): + cid = id + '/' + fld + cid = cid.replace(' ', '_') + children.append(cid) + record['children'] = children or [] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} + else: + ref = value.pop('relation') + cfields = self.fields_get(req, ref) + cfields_order = cfields.keys() + cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', ''))) + children = [] + for j, fld in enumerate(cfields_order): + cid = id + '/' + fld + cid = cid.replace(' ', '_') + children.append(cid) + record['children'] = children or [] + record['params'] = {'model': ref, 'prefix': id, 'name': nm} + + records.reverse() + return records + + @openerpweb.jsonrequest + def save_export_lists(self, req, name, model, field_list): + result = {'resource':model, 'name':name, 'export_fields': []} + for field in field_list: + result['export_fields'].append((0, 0, {'name': field})) + return req.session.model("ir.exports").create(result, req.session.eval_context(req.context)) + + @openerpweb.jsonrequest + def exist_export_lists(self, req, model): + export_model = req.session.model("ir.exports") + return export_model.read(export_model.search([('resource', '=', model)]), ['name']) + + @openerpweb.jsonrequest + def delete_export(self, req, export_id): + req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context)) + return True + + @openerpweb.jsonrequest + def namelist(self,req, model, export_id): + + result = self.get_data(req, model, req.session.eval_context(req.context)) + ir_export_obj = req.session.model("ir.exports") + ir_export_line_obj = req.session.model("ir.exports.line") + + field = ir_export_obj.read(export_id) + fields = ir_export_line_obj.read(field['export_fields']) + + name_list = {} + [name_list.update({field['name']: result.get(field['name'])}) for field in fields] + return name_list + + def get_data(self, req, model, context=None): + ids = [] + context = context or {} + fields_data = {} + proxy = req.session.model(model) + fields = self.fields_get(req, model) + if not ids: + f1 = proxy.fields_view_get(False, 'tree', context)['fields'] + f2 = proxy.fields_view_get(False, 'form', context)['fields'] + + fields = dict(f1) + fields.update(f2) + fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) + + def rec(fields): + _fields = {'id': 'ID' , '.id': 'Database ID' } + def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2): + fields_order = fields.keys() + fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', ''))) + + for field in fields_order: + fields_data[prefix_node+field] = fields[field] + if prefix_node: + fields_data[prefix_node + field]['string'] = '%s%s' % (prefix_value, fields_data[prefix_node + field]['string']) + st_name = fields[field]['string'] or field + _fields[prefix_node+field] = st_name + if fields[field].get('relation', False) and level>0: + fields2 = self.fields_get(req, fields[field]['relation']) + fields2.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}}) + model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1) + model_populate(fields) + return _fields + return rec(fields) + + @openerpweb.jsonrequest + def export_data(self, req, model, fields, ids, domain, import_compat=False, export_format="csv", context=None): + context = req.session.eval_context(req.context) + modle_obj = req.session.model(model) + ids = ids or modle_obj.search(domain, context=context) + + field = fields.keys() + result = modle_obj.export_data(ids, field , context).get('datas',[]) + + if not import_compat: + field = [val.strip() for val in fields.values()] + + if export_format == 'xls': + return export_xls(field, result) + else: + return export_csv(field, result) + diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html index 0c615ed8903..679ac454ca7 100644 --- a/addons/base/static/src/base.html +++ b/addons/base/static/src/base.html @@ -27,6 +27,7 @@ + @@ -39,6 +40,7 @@ + diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base/static/src/css/export.css similarity index 95% rename from addons/base_export/static/src/css/base_export.css rename to addons/base/static/src/css/export.css index 485338b63e3..051b5cb076c 100644 --- a/addons/base_export/static/src/css/base_export.css +++ b/addons/base/static/src/css/export.css @@ -55,7 +55,7 @@ div#left_field_panel { text-align: left; white-space: nowrap; padding: 4px 5px; - background: url(/base_export/static/src/img/header.gif); + background: url(/base/static/src/img/header.gif); } diff --git a/addons/base/static/src/img/collapse.gif b/addons/base/static/src/img/collapse.gif old mode 100755 new mode 100644 diff --git a/addons/base/static/src/img/expand.gif b/addons/base/static/src/img/expand.gif old mode 100755 new mode 100644 diff --git a/addons/base_export/static/src/img/header.gif b/addons/base/static/src/img/header.gif similarity index 100% rename from addons/base_export/static/src/img/header.gif rename to addons/base/static/src/img/header.gif diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js index 28022f8b764..8e593de5949 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/base.js @@ -87,6 +87,9 @@ openerp.base = function(instance) { if (openerp.base.view_tree) { openerp.base.view_tree(instance); } + if (openerp.base.export) { + openerp.base.export(instance); + } }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base/static/src/js/export.js similarity index 88% rename from addons/base_export/static/src/js/base_export.js rename to addons/base/static/src/js/export.js index 566a6cf167c..e12ba0e613c 100644 --- a/addons/base_export/static/src/js/base_export.js +++ b/addons/base/static/src/js/export.js @@ -1,7 +1,5 @@ -openerp.base_export = function(openerp) { -QWeb.add_template('/base_export/static/src/xml/base_export.xml'); -openerp.base.views.add('export', 'openerp.base_export.Export'); -openerp.base_export.Export = openerp.base.Dialog.extend({ +openerp.base.export = function(openerp) { +openerp.base.Export = openerp.base.Dialog.extend({ init: function(parent, dataset, views){ this._super(parent); @@ -57,7 +55,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ }); import_comp = $("#import_compat option:selected").val() var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} - this.rpc("/base_export/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data); + this.rpc("/base/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data); $("#import_compat").change(function(){ $("#fields_list option").remove(); @@ -65,7 +63,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ import_comp = $("#import_compat option:selected").val(); if(import_comp){ var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id} - self.rpc("/base_export/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data); + self.rpc("/base/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data); } }); }, @@ -76,20 +74,20 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $("#ExistsExportList").show(); } else{ - this.rpc("/base_export/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){ + this.rpc("/base/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){ if(export_list.length){ $("#ExistsExportList").append(QWeb.render('Exists.ExportList', {'existing_exports':export_list})); $("#saved_export_list").change(function(){ $("#fields_list option").remove(); export_id = $("#saved_export_list option:selected").val(); if (export_id){ - self.rpc("/base_export/export/namelist", {"model": self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field); + self.rpc("/base/export/namelist", {"model": self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field); } }); $('#delete_export_list').click(function(){ select_exp = $("#saved_export_list option:selected") if (select_exp.val()){ - self.rpc("/base_export/export/delete_export", {"export_id": parseInt(select_exp.val())}, {}); + self.rpc("/base/export/delete_export", {"export_id": parseInt(select_exp.val())}, {}); select_exp.remove(); if($("#saved_export_list option").length <= 1){ $("#ExistsExportList").hide(); @@ -137,7 +135,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ var self = this; var export_field = self.get_fields() if(export_field.length){ - self.rpc("/base_export/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id){ + self.rpc("/base/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id){ if(exp_id){ if($("#saved_export_list").length > 0){ $("#saved_export_list").append( new Option(value, exp_id)); @@ -177,11 +175,11 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } }); if (is_loaded == 0) { - if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base_export/static/src/img/expand.gif') { + if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') { if (model){ import_comp = $("#import_compat option:selected").val() var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']} - self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "name": name, "field_parent" : self.field_id, "params":params}, function (results) { + self.rpc("/base/export/get_fields", {"model": model, "prefix": prefix, "name": name, "field_parent" : self.field_id, "params":params}, function (results) { self.on_show_data(results); }); } @@ -200,7 +198,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ var self = this; var current_tr = $("tr[id='treerow-" + self.field_id + "']"); if (current_tr.length >= 1){ - current_tr.find('img').attr('src','/base_export/static/src/img/collapse.gif'); + current_tr.find('img').attr('src','/base/static/src/img/collapse.gif'); current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result})); } else{ @@ -279,7 +277,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ arrow = {left: 37, up: 38, right: 39, down: 40 }; switch (keyCode) { case arrow.left: - if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){ + if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ self.on_click(this.id, result); } break; @@ -295,7 +293,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ $(elem).prev().find('a').focus(); break; case arrow.right: - if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/expand.gif'){ + if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){ self.on_click(this.id, result); } break; @@ -340,10 +338,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ showcontent: function (id, flag) { var first_child = $("tr[id='treerow-" + id + "']").find('img') if (flag) { - first_child.attr('src', '/base_export/static/src/img/expand.gif'); + first_child.attr('src', '/base/static/src/img/expand.gif'); } else { - first_child.attr('src', '/base_export/static/src/img/collapse.gif'); + first_child.attr('src', '/base/static/src/img/collapse.gif'); } var child_field = $("tr[id^='treerow-" + id +"/']") var child_len = (id.split("/")).length + 1 @@ -353,8 +351,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ } else { if(child_len == (child_field[i].id.split("/")).length){ - if( jQuery(child_field[i]).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){ - jQuery(child_field[i]).find('img').attr('src', '/base_export/static/src/img/expand.gif') + if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){ + jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif') } $(child_field[i]).show(); } @@ -395,7 +393,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({ import_comp = $("#import_compat option:selected").val() export_format = $("#export_format").val() - self.rpc("/base_export/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){ + self.rpc("/base/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){ window.location="data:text/csv/excel;charset=utf8," + data self.close(); }); diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 0f520cab13d..0d8539d6292 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -200,7 +200,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ if(this.active_view == 'list' || this.active_view == 'form') { this.views[this.active_view].controller.$element.after(QWeb.render('ExportView')) this.$element.find('#exportview').click(function(ev) { - var export_view = new openerp.base_export.Export(self, self.dataset, self.views); + var export_view = new openerp.base.Export(self, self.dataset, self.views); export_view.start(false); ev.preventDefault(); }); @@ -417,6 +417,7 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({ openerp.base.NullSidebar = openerp.base.generate_null_object_class(openerp.base.Sidebar); +/* openerp.base.Export = openerp.base.Dialog.extend({ dialog_title: "Export", template: 'ExportDialog', @@ -435,7 +436,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ this.$element.dialog("close"); } }); - +*/ openerp.base.View = openerp.base.Controller.extend({ /** * Fetches and executes the action identified by ``action_data``. diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 04841a2e297..fee6a07281b 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -103,7 +103,7 @@
- + - +
@@ -135,7 +135,7 @@
- + @@ -311,7 +311,7 @@ t-att-data-index="row_index"> 		- + @@ -786,7 +786,7 @@ -
@@ -932,4 +932,145 @@ .unwrap(); + + + Export + + + + + + + + + + + + + + +
+ This wizard will export all data that matches the current search criteria to a CSV file. + You can export all data or only the fields that can be reimported after modification. +
+ + + + + + + + +
+ + + +
+
+ + + + + + + + + + + +
Available fieldsFields to export + Save fields list +
+
+
+
+
+ 		+ + + + + + + + + + +
+ +
+ +
+ +
+ 		+ +
+
+ + + + + + +
Name
+ + + +
+ + + + + + + + + + +
&nbsp; + + + + + + + + + +
+
+ +
- - - - - - - - - - -
- This wizard will export all data that matches the current search criteria to a CSV file. - You can export all data or only the fields that can be reimported after modification. -
- - - - - - - - -
- - - -
-
- - - - - - - - - - - -
Available fieldsFields to export - Save fields list -
-
-
-
-
- 		- - - - - - - - - - -
- -
- -
- -
- 		- -
-
- - - - - - -
Name
- - - -
- - - - - - - - - - -
&nbsp; - - - - - - - - - -
-
- -
- From 509aaab131b6f0485bac50aaf18dbf8eb8bdcd7e Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 25 Jul 2011 11:08:04 +0530 Subject: [PATCH 082/167] [FIX] fix some selector problem. bzr revid: ysa@tinyerp.com-20110725053804-naq7vcrzg8kjrzl3 --- addons/base/static/src/js/export.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/export.js index e12ba0e613c..0f7db81f6d4 100644 --- a/addons/base/static/src/js/export.js +++ b/addons/base/static/src/js/export.js @@ -1,6 +1,5 @@ openerp.base.export = function(openerp) { openerp.base.Export = openerp.base.Dialog.extend({ - init: function(parent, dataset, views){ this._super(parent); this.dataset = dataset @@ -206,18 +205,18 @@ openerp.base.Export = openerp.base.Dialog.extend({ } _.each(result, function(record) { if(record.field_type == "one2many"){ - var o2m_fld = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + var o2m_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); o2m_fld.addClass("readonlyfield"); } if ((record.required == true) || record.required == "True"){ - var required_fld = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + var required_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); required_fld.addClass("requiredfield"); } - $("img[id ^='parentimg-" + record.id +"']").click(function(){ + $("img[id='parentimg-" + record.id +"']").click(function(){ self.on_click(this.id, result); }); - $("tr[id^='treerow-" + record.id + "']").click(function(e){ + $("tr[id='treerow-" + record.id + "']").click(function(e){ if (e.shiftKey == true){ var frst_click,scnd_click = ''; if (self.row_index == 0){ @@ -244,10 +243,10 @@ openerp.base.Export = openerp.base.Dialog.extend({ } self.row_index = this.rowIndex; - $("tr[id^='treerow-" + record.id + "']").keyup(function (e) { + $("tr[id='treerow-" + record.id + "']").keyup(function (e) { self.row_index = 0; }); - var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); + var o2m_selection = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); if ($(o2m_selection).hasClass("readonlyfield")){ return false; } @@ -272,7 +271,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ return false; }); - $("tr[id^='treerow-" + record.id + "']").keydown(function (e) { + $("tr[id='treerow-" + record.id + "']").keydown(function (e) { var keyCode = e.keyCode || e.which; arrow = {left: 37, up: 38, right: 39, down: 40 }; switch (keyCode) { @@ -310,7 +309,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ break; } }); - $("tr[id^='treerow-" + record.id + "']").dblclick(function (e) { + $("tr[id='treerow-" + record.id + "']").dblclick(function (e) { var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column'); if (! $(o2m_selection).hasClass("readonlyfield")){ var field_id = $(this).find("a").attr("id"); @@ -325,7 +324,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){ field_id = event.relatedTarget.attributes["id"]["value"] if (field_id && field_id.split("-")[0] == 'export'){ - if(!$("tr[id^='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("readonlyfield")){ + if(!$("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("readonlyfield")){ self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]); } } From 883380866e8917594525a7a0877f56729df8f238 Mon Sep 17 00:00:00 2001 From: "Kunal Chavda (OpenERP)" Date: Mon, 25 Jul 2011 11:36:32 +0530 Subject: [PATCH 083/167] [FIX]Fix code for o2m field should readonly if import compatible option select. bzr revid: kch@tinyerp.com-20110725060632-uj2bkmg31k3gby70 --- addons/base/static/src/js/export.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/export.js index 0f7db81f6d4..ff8e8604348 100644 --- a/addons/base/static/src/js/export.js +++ b/addons/base/static/src/js/export.js @@ -195,6 +195,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ on_show_data: function(result) { var self = this; + var imp_cmpt = parseInt($("#import_compat option:selected").val()); var current_tr = $("tr[id='treerow-" + self.field_id + "']"); if (current_tr.length >= 1){ current_tr.find('img').attr('src','/base/static/src/img/collapse.gif'); @@ -204,7 +205,7 @@ openerp.base.Export = openerp.base.Dialog.extend({ $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result})); } _.each(result, function(record) { - if(record.field_type == "one2many"){ + if((record.field_type == "one2many") && imp_cmpt){ var o2m_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column'); o2m_fld.addClass("readonlyfield"); } From 749cf7443d991d50551b52ed368fe8c181649b45 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 12:41:07 +0530 Subject: [PATCH 084/167] [FIX] Updated with lated branch changes. bzr revid: noz@tinyerp.com-20110726071107-r6zwvyiolb7emlq7 --- addons/base/static/src/js/chrome.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 10e398b26bf..8c03dbb55e6 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -693,6 +693,9 @@ openerp.base.Database = openerp.base.Controller.extend({ this.option_id = option_id; this.$option_id = $('#' + option_id); this.$option_id.html(''); + if(this.parent && this.parent.session) { + this.session = this.parent.session; + } }, start: function() { this.$element.html(QWeb.render("Database", this)); @@ -717,7 +720,7 @@ openerp.base.Database = openerp.base.Controller.extend({ this.$element.find('#db-restore').click(this.do_db_restore); this.$element.find('#db-change-password').click(this.do_change_password); this.$element.find('#back-to-login').click(function() { - self.header = new openerp.base.Header(self.session, "oe_header"); + self.header = new openerp.base.Header(self, "oe_header"); self.header.on_logout(); }); }, @@ -959,6 +962,9 @@ openerp.base.Login = openerp.base.Controller.extend({ this.selected_login = this.selected_login || "admin"; this.selected_password = this.selected_password || "a"; } + if(this.parent && this.parent.session) { + this.session = this.parent.session; + } }, start: function() { var self = this; @@ -978,7 +984,7 @@ openerp.base.Login = openerp.base.Controller.extend({ this.$element.closest(".openerp").addClass("login-mode"); this.$element.find('#oe-db-config').click(function() { - self.database = new openerp.base.Database(self.session, "oe_database", "oe_db_options"); + self.database = new openerp.base.Database(self, "oe_database", "oe_db_options"); self.database.start(); }); @@ -1035,6 +1041,8 @@ openerp.base.Login = openerp.base.Controller.extend({ openerp.base.Header = openerp.base.Controller.extend({ init: function(parent, element_id) { this._super(parent, element_id); + if(parent) + this.session = parent.session; }, start: function() { this.do_update(); @@ -1043,10 +1051,7 @@ openerp.base.Header = openerp.base.Controller.extend({ this.$element.html(QWeb.render("Header", this)); this.$element.find(".logout").click(this.on_logout); }, - on_logout: function() { - this.login = new openerp.base.Login(this.session, "oe_login"); - this.login.start(); - } + on_logout: function() {} }); openerp.base.Menu = openerp.base.Controller.extend({ From c2bbedd32be6d888a537150e658c9a4f6fb496bc Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 12:50:10 +0530 Subject: [PATCH 085/167] [FIX] Removed tabs instead of spaces from css. bzr revid: noz@tinyerp.com-20110726072010-9cfabvfpkvt2cg39 --- addons/base/static/src/css/base.css | 177 ++++++++++++++-------------- 1 file changed, 88 insertions(+), 89 deletions(-) diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index a08e6bf02e4..6228e0c1e17 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -143,8 +143,8 @@ body.openerp { /* Database */ .openerp.database_block .db_options_row { - height: 100%; - display: table-row; + height: 100%; + display: table-row; } .openerp.database_block .menu, @@ -155,63 +155,63 @@ body.openerp { } .db_container { - width: 15%; - background: #666666; + width: 15%; + background: #666666; } ul.db_options li { - padding: 5px 0 10px 5px; - background: #949292; /* Old browsers */ - background: -moz-linear-gradient(top, #949292 30%, #6d6b6b 95%, #282828 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,#949292), color-stop(95%,#6d6b6b), color-stop(100%,#282828)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#282828',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* W3C */ - /* for ie9 */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */ - border: none; - /* overriding jquery ui */ - -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; - display: block; - font-weight: bold; - text-transform: uppercase; - margin: 1px; - color: #EEEEEE; - cursor: pointer; - width: 196px; - font-size: 12px; + padding: 5px 0 10px 5px; + background: #949292; /* Old browsers */ + background: -moz-linear-gradient(top, #949292 30%, #6d6b6b 95%, #282828 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,#949292), color-stop(95%,#6d6b6b), color-stop(100%,#282828)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#282828',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #949292 30%,#6d6b6b 95%,#282828 100%); /* W3C */ + /* for ie9 */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */ + border: none; + /* overriding jquery ui */ + -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + display: block; + font-weight: bold; + text-transform: uppercase; + margin: 1px; + color: #EEEEEE; + cursor: pointer; + width: 196px; + font-size: 12px; } .db_option_table { - border: 1px solid #5A5858; - padding: 5px; - -moz-border-radius: 10px; + border: 1px solid #5A5858; + padding: 5px; + -moz-border-radius: 10px; } table.db_option_table input.required { - background-color: #D2D2FF; + background-color: #D2D2FF; } .db_option_table input[type="text"], input[type="password"], select { - width: 300px; + width: 300px; } .option_string { - font-weight: bold; - color: #555; - width: 100%; - text-align: center; - padding: 10px 0; - font-size: large; + font-weight: bold; + color: #555; + width: 100%; + text-align: center; + padding: 10px 0; + font-size: large; } label.error { - float: none; - color: red; - padding-left: .5em; - vertical-align: top; + float: none; + color: red; + padding-left: .5em; + vertical-align: top; } /* Main*/ @@ -233,14 +233,14 @@ label.error { .openerp .menu { height: 34px; -background: #cc4e45; /* Old browsers */ -background: -moz-linear-gradient(top, #cc4e45 0%, #b52d20 8%, #7a211a 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cc4e45), color-stop(8%,#b52d20), color-stop(100%,#7a211a)); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* Opera11.10+ */ -background: -ms-linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* IE10+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CC4E45', endColorstr='#7A211A',GradientType=0 ); /* IE6-9 */ -background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */ + background: #cc4e45; /* Old browsers */ + background: -moz-linear-gradient(top, #cc4e45 0%, #b52d20 8%, #7a211a 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#cc4e45), color-stop(8%,#b52d20), color-stop(100%,#7a211a)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CC4E45', endColorstr='#7A211A',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */ } .openerp .menu td { text-align: center; @@ -253,14 +253,14 @@ background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */ margin: 3px 2px; padding: 0 8px; - background: #bd5e54; /* Old browsers */ - background: -moz-linear-gradient(top, #bd5e54 0%, #90322a 60%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bd5e54), color-stop(60%,#90322a)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#BD5E54', endColorstr='#90322A',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #bd5e54 0%,#90322a 60%); /* W3C */ + background: #bd5e54; /* Old browsers */ + background: -moz-linear-gradient(top, #bd5e54 0%, #90322a 60%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bd5e54), color-stop(60%,#90322a)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #bd5e54 0%,#90322a 60%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#BD5E54', endColorstr='#90322A',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #bd5e54 0%,#90322a 60%); /* W3C */ border: 1px solid #6E2A24; border-radius: 4px; @@ -280,16 +280,16 @@ background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */ .openerp .menu a:hover, .openerp .menu a:focus, .openerp .menu a.active { - background: #c6c6c6; /* Old browsers */ - background: -moz-linear-gradient(top, #c6c6c6 0%, #5c5c5c 7%, #969595 86%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#c6c6c6), color-stop(7%,#5c5c5c), color-stop(86%,#969595)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C6C6C6', endColorstr='#969595',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* W3C */ - /* for ie */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5c5c5c', endColorstr='#969595',GradientType=0 ); /* IE6-9 */ + background: #c6c6c6; /* Old browsers */ + background: -moz-linear-gradient(top, #c6c6c6 0%, #5c5c5c 7%, #969595 86%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#c6c6c6), color-stop(7%,#5c5c5c), color-stop(86%,#969595)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C6C6C6', endColorstr='#969595',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* W3C */ + /* for ie */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5c5c5c', endColorstr='#969595',GradientType=0 ); /* IE6-9 */ color: #fff; } @@ -311,19 +311,19 @@ background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */ } .openerp .secondary_menu h3 { padding: 0 0 2px; - background: #949292; /* Old browsers */ - background: -moz-linear-gradient(top, #949292 0%, #6d6b6b 87%, #282828 99%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#949292), color-stop(87%,#6d6b6b), color-stop(99%,#282828)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#282828',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* W3C */ - /* for ie9 */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */ + background: #949292; /* Old browsers */ + background: -moz-linear-gradient(top, #949292 0%, #6d6b6b 87%, #282828 99%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#949292), color-stop(87%,#6d6b6b), color-stop(99%,#282828)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#282828',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* W3C */ + /* for ie9 */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */ border: none; /* overriding jquery ui */ - -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; + -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; } .openerp .secondary_menu h4 { padding: 0 0 2px 10px; @@ -349,17 +349,16 @@ background: linear-gradient(top, #cc4e45 0%,#b52d20 8%,#7a211a 100%); /* W3C */ .openerp .secondary_menu h4:hover, .openerp .secondary_menu h4:active, .openerp .secondary_menu h4.active { - background: #ffffff; /* Old browsers */ - background: -moz-linear-gradient(top, #ffffff 0%, #d8d8d8 11%, #afafaf 86%, #333333 91%, #5a5858 96%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(11%,#d8d8d8), color-stop(86%,#afafaf), color-stop(91%,#333333), color-stop(96%,#5a5858)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* Opera11.10+ */ - background: -ms-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#5A5858',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* W3C */ - /* overriding jquery ui */ - -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; - + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #ffffff 0%, #d8d8d8 11%, #afafaf 86%, #333333 91%, #5a5858 96%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(11%,#d8d8d8), color-stop(86%,#afafaf), color-stop(91%,#333333), color-stop(96%,#5a5858)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#5A5858',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* W3C */ + /* overriding jquery ui */ + -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; color: #3f3d3d; text-shadow: #fff 0 1px 0; border: none !important; From 01ae186bec0f68d1f43a8fb032fdb35ba63345b1 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 13:33:18 +0530 Subject: [PATCH 086/167] [FIX] Fixed spaces instead of tabs. bzr revid: noz@tinyerp.com-20110726080318-gu5xvwlepj8o7nmi --- addons/base/controllers/main.py | 144 +++++------ addons/base/static/src/js/chrome.js | 380 ++++++++++++++-------------- 2 files changed, 262 insertions(+), 262 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 82f23d82a43..4e4c5b47d39 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -73,23 +73,21 @@ class Database(openerpweb.Controller): return {"db_list": dbs} @openerpweb.jsonrequest - def db_operation(self, req, flag, **kw): + def create_db(self, req, **kw): - if flag == 'create': - - super_admin_pwd = kw.get('super_admin_pwd') - dbname = kw.get('db') - demo_data = kw.get('demo_data') - db_lang = kw.get('db_lang') - admin_pwd = kw.get('admin_pwd') - confirm_pwd = kw.get('confirm_pwd') - - if not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname): - return {'error': "You must avoid all accents, space or special characters.", 'title': 'Bad database name'} - - ok = False - try: - return req.session.proxy("db").create(super_admin_pwd, dbname, demo_data, db_lang, admin_pwd) + super_admin_pwd = kw.get('super_admin_pwd') + dbname = kw.get('db') + demo_data = kw.get('demo_data') + db_lang = kw.get('db_lang') + admin_pwd = kw.get('admin_pwd') + confirm_pwd = kw.get('confirm_pwd') + + if not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname): + return {'error': "You must avoid all accents, space or special characters.", 'title': 'Bad database name'} + + ok = False + try: + return req.session.proxy("db").create(super_admin_pwd, dbname, demo_data, db_lang, admin_pwd) # while True: # try: # progress, users = req.session.proxy('db').get_progress(super_admin_pwd, res) @@ -106,65 +104,69 @@ class Database(openerpweb.Controller): # except DatabaseCreationCrash: # return {'error': "The server crashed during installation.\nWe suggest you to drop this database.", # 'title': 'Error during database creation'} - except Exception, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Create Database'} - else: - return {'error': 'Could not create database !', 'title': 'Create Database'} + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !', 'title': 'Create Database'} + else: + return {'error': 'Could not create database !', 'title': 'Create Database'} + + @openerpweb.jsonrequest + def drop_db(self, req, **kw): + db = kw.get('db') + password = kw.get('password') - elif flag == 'drop': - db = kw.get('db') - password = kw.get('password') + try: + return req.session.proxy("db").drop(password, db) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !', 'title': 'Drop Database'} + else: + return {'error': 'Could not drop database !', 'title': 'Drop Database'} + + @openerpweb.jsonrequest + def backup_db(self, req, **kw): + db = kw.get('db') + password = kw.get('password') + try: + res = req.session.proxy("db").dump(password, db) + if res: + cherrypy.response.headers['Content-Type'] = "application/data" + cherrypy.response.headers['Content-Disposition'] = 'filename="' + db + '.dump"' + return base64.decodestring(res) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !', 'title': 'Backup Database'} + else: + return {'error': 'Could not drop database !', 'title': 'Backup Database'} - try: - return req.session.proxy("db").drop(password, db) - except Exception, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Drop Database'} - else: - return {'error': 'Could not drop database !', 'title': 'Drop Database'} + @openerpweb.jsonrequest + def restore_db(self, req, **kw): + filename = kw.get('filename') + db = kw.get('db') + password = kw.get('password') - elif flag == 'backup': - db = kw.get('db') - password = kw.get('password') - try: - res = req.session.proxy("db").dump(password, db) - if res: - cherrypy.response.headers['Content-Type'] = "application/data" - cherrypy.response.headers['Content-Disposition'] = 'filename="' + db + '.dump"' - return base64.decodestring(res) - except Exception, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Backup Database'} - else: - return {'error': 'Could not drop database !', 'title': 'Backup Database'} - - elif flag == 'restore': - filename = kw.get('filename') - db = kw.get('db') - password = kw.get('password') - - try: - data = base64.encodestring(filename.file.read()) - return req.session.proxy("db").restore(password, db, data) - except Exception, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Restore Database'} - else: - return {'error': 'Could not restore database !', 'title': 'Restore Database'} + try: + data = base64.encodestring(filename.file.read()) + return req.session.proxy("db").restore(password, db, data) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !', 'title': 'Restore Database'} + else: + return {'error': 'Could not restore database !', 'title': 'Restore Database'} - elif flag == 'change_password': - old_password = kw.get('old_password') - new_password = kw.get('new_password') - confirm_password = kw.get('confirm_password') - - try: - return req.session.proxy("db").change_admin_password(old_password, new_password) - except Exception, e: - if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Change Password'} - else: - return {'error': 'Error, password not changed !', 'title': 'Change Password'} + @openerpweb.jsonrequest + def change_password_db(self, req, **kw): + old_password = kw.get('old_password') + new_password = kw.get('new_password') + confirm_password = kw.get('confirm_password') + + try: + return req.session.proxy("db").change_admin_password(old_password, new_password) + except Exception, e: + if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': + return {'error': 'Bad super admin password !', 'title': 'Change Password'} + else: + return {'error': 'Error, password not changed !', 'title': 'Change Password'} class Session(openerpweb.Controller): _cp_path = "/base/session" diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 8c03dbb55e6..f9dffcfc66a 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -688,19 +688,18 @@ openerp.base.Loading = openerp.base.Controller.extend({ }); openerp.base.Database = openerp.base.Controller.extend({ - init: function(parent, element_id, option_id) { - this._super(parent, element_id); - this.option_id = option_id; - this.$option_id = $('#' + option_id); - this.$option_id.html(''); - if(this.parent && this.parent.session) { + init: function(parent, element_id, option_id) { + this._super(parent, element_id); + this.option_id = option_id; + this.$option_id = $('#' + option_id); + this.$option_id.html(''); + if(this.parent && this.parent.session) { this.session = this.parent.session; } - }, - start: function() { - this.$element.html(QWeb.render("Database", this)); - - this.$element.closest(".openerp").removeClass("login-mode"); + }, + start: function() { + this.$element.html(QWeb.render("Database", this)); + this.$element.closest(".openerp").removeClass("login-mode"); this.$element.closest(".openerp").addClass("database_block"); var self = this; @@ -710,8 +709,8 @@ openerp.base.Database = openerp.base.Controller.extend({ }); this.rpc("/base/session/get_lang_list", {}, function(result) { - self.lang_list = result.lang_list; - self.do_db_create(); + self.lang_list = result.lang_list; + self.do_db_create(); }); this.$element.find('#db-create').click(this.do_db_create); @@ -720,228 +719,227 @@ openerp.base.Database = openerp.base.Controller.extend({ this.$element.find('#db-restore').click(this.do_db_restore); this.$element.find('#db-change-password').click(this.do_change_password); this.$element.find('#back-to-login').click(function() { - self.header = new openerp.base.Header(self, "oe_header"); - self.header.on_logout(); - }); - }, - - do_db_create: function() { - var self = this; + self.header = new openerp.base.Header(self, "oe_header"); + self.header.on_logout(); + }); + }, + + do_db_create: function() { + var self = this; self.db_string = "CREATE DATABASE"; self.$option_id.html(QWeb.render("CreateDB", self)); $("form[name=create_db_form]").validate(); $("input[name=create_confirm_pwd]").rules("add", { - equalTo: 'input[name=create_admin_pwd]', - messages: { - required: "Password did not match !" - } - }); - + equalTo: 'input[name=create_admin_pwd]', + messages: { + required: "Password did not match !" + } + }); + $("input[name=super_admin_pwd]").focus(); self.$option_id.find('form[name=create_db_form]').submit(function(ev) { - ev.preventDefault(); - - var super_admin_pwd = self.$option_id.find("input[name=super_admin_pwd]").val(); - var db = self.$option_id.find("input[name=db_name]").val(); - var demo_data = self.$option_id.find("input[name=demo_data]:checked"); - var db_lang = self.$option_id.find("select[name=db_lang]").val(); - var admin_pwd = self.$option_id.find("input[name=create_admin_pwd]").val(); - var confirm_pwd = self.$option_id.find("input[name=create_confirm_pwd]").val(); + ev.preventDefault(); + + var super_admin_pwd = self.$option_id.find("input[name=super_admin_pwd]").val(); + var db = self.$option_id.find("input[name=db_name]").val(); + var demo_data = self.$option_id.find("input[name=demo_data]:checked"); + var db_lang = self.$option_id.find("select[name=db_lang]").val(); + var admin_pwd = self.$option_id.find("input[name=create_admin_pwd]").val(); + var confirm_pwd = self.$option_id.find("input[name=create_confirm_pwd]").val(); - if (demo_data.length) - demo_data = 'True'; - else - demo_data = 'False'; - - self.rpc("/base/database/db_operation", { - 'flag': 'create', - 'super_admin_pwd': super_admin_pwd, - 'db': db, - 'demo_data': demo_data, - 'db_lang': db_lang, - 'admin_pwd': admin_pwd, - 'confirm_pwd': confirm_pwd - }, - function(result) { - if (result && !result.error) { - - } else if(result.error) { - var db_error_dialog = _.uniqueId("db_error_dialog"); - $('
', {id: db_error_dialog}).dialog({ - modal: true, - title: result.title, - buttons: { - Ok: function() { - $(this).dialog("close"); - } - } - }).html("
" + result.error + "
"); - } - }); - }); + if (demo_data.length) + demo_data = 'True'; + else + demo_data = 'False'; + + self.rpc("/base/database/create_db", { + 'super_admin_pwd': super_admin_pwd, + 'db': db, + 'demo_data': demo_data, + 'db_lang': db_lang, + 'admin_pwd': admin_pwd, + 'confirm_pwd': confirm_pwd + }, + function(result) { + if (result && !result.error) { + + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); + }); }, - do_db_drop: function() { - var self = this; + do_db_drop: function() { + var self = this; self.db_string = "DROP DATABASE"; self.$option_id.html(QWeb.render("DropDB", self)); $("form[name=drop_db_form]").validate(); self.$option_id.find('form[name=drop_db_form]').submit(function(ev) { - ev.preventDefault(); - - var db = self.$option_id.find("select[name=drop_db]").val(); - var password = self.$option_id.find("input[name=drop_pwd]").val(); - - if (confirm("Do you really want to delete the database: " + db + " ?")) { - self.rpc("/base/database/db_operation", {'flag': 'drop', 'db': db, 'password': password}, - function(result) { - if (result && ! result.error) { - self.$option_id.find("select[name=drop_db] :selected").remove(); - self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); - } else if(result.error) { - var db_error_dialog = _.uniqueId("db_error_dialog"); - $('
', {id: db_error_dialog}).dialog({ - modal: true, - title: result.title, - buttons: { - Ok: function() { - $(this).dialog("close"); - } - } - }).html("
" + result.error + "
"); - } - }); - } + ev.preventDefault(); + + var db = self.$option_id.find("select[name=drop_db]").val(); + var password = self.$option_id.find("input[name=drop_pwd]").val(); + + if (confirm("Do you really want to delete the database: " + db + " ?")) { + self.rpc("/base/database/drop_db", {'db': db, 'password': password}, + function(result) { + if (result && ! result.error) { + self.$option_id.find("select[name=drop_db] :selected").remove(); + self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); + } }); }, do_db_backup: function() { - var self = this; - self.db_string = "BACKUP DATABASE"; + var self = this; + self.db_string = "BACKUP DATABASE"; self.$option_id.html(QWeb.render("BackupDB", self)); $("form[name=backup_db_form]").validate(); self.$option_id.find('form[name=backup_db_form]').submit(function(ev) { - ev.preventDefault(); - - var db = self.$option_id.find("select[name=backup_db]").val(); - var password = self.$option_id.find("input[name=backup_pwd]").val(); - - self.rpc("/base/database/db_operation", {'flag': 'backup', 'db': db, 'password': password}, - function(result) { - if (result && !result.error) { - self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'"); - } else if(result.error) { - var db_error_dialog = _.uniqueId("db_error_dialog"); - $('
', {id: db_error_dialog}).dialog({ - modal: true, - title: result.title, - buttons: { - Ok: function() { - $(this).dialog("close"); - } - } - }).html("
" + result.error + "
"); - } - }); + ev.preventDefault(); + + var db = self.$option_id.find("select[name=backup_db]").val(); + var password = self.$option_id.find("input[name=backup_pwd]").val(); + + self.rpc("/base/database/backup_db", {'db': db, 'password': password}, + function(result) { + if (result && !result.error) { + self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); }); }, do_db_restore: function() { - var self = this; - self.db_string = "RESTORE DATABASE"; + var self = this; + self.db_string = "RESTORE DATABASE"; self.$option_id.html(QWeb.render("RestoreDB", self)); $("form[name=restore_db_form]").validate(); self.$option_id.find('form[name=restore_db_form]').submit(function(ev) { - ev.preventDefault(); - - var db = self.$option_id.find("input[name=restore_db]").val(); - var password = self.$option_id.find("input[name=restore_pwd]").val(); - var new_db = self.$option_id.find("input[name=new_db]").val(); + ev.preventDefault(); - self.rpc("/base/database/db_operation", {'flag': 'restore', 'db': db, 'password': password, 'new_db': new_db}, - function(result) { - if (result && !result.error) { - self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'"); - } else if(result.error) { - var db_error_dialog = _.uniqueId("db_error_dialog"); - $('
', {id: db_error_dialog}).dialog({ - modal: true, - title: result.title, - buttons: { - Ok: function() { - $(this).dialog("close"); - } - } - }).html("
" + result.error + "
"); - } - }); + var db = self.$option_id.find("input[name=restore_db]").val(); + var password = self.$option_id.find("input[name=restore_pwd]").val(); + var new_db = self.$option_id.find("input[name=new_db]").val(); + + self.rpc("/base/database/restore_db", {'db': db, 'password': password, 'new_db': new_db}, + function(result) { + if (result && !result.error) { + self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); }); - }, - - do_change_password: function() { - var self = this; + }, + + do_change_password: function() { + var self = this; self.db_string = "CHANGE DATABASE PASSWORD"; self.$option_id.html(QWeb.render("Change_DB_Pwd", self)); $("form[name=change_pwd_form]").validate(); $("input[name=old_pwd]").rules("add", { - minlength: 1, - messages: { - required: "Please enter password !" - } - }); - $("input[name=new_pwd]").rules("add", { - minlength: 1, - messages: { - required: "Please enter password !" - } - }); - $("input[name=confirm_pwd]").rules("add", { - equalTo: 'input[name=new_pwd]', - messages: { - required: "Password did not match !" - } - }); - - $("input[name=old_pwd]").focus(); + minlength: 1, + messages: { + required: "Please enter password !" + } + }); + $("input[name=new_pwd]").rules("add", { + minlength: 1, + messages: { + required: "Please enter password !" + } + }); + $("input[name=confirm_pwd]").rules("add", { + equalTo: 'input[name=new_pwd]', + messages: { + required: "Password did not match !" + } + }); + + $("input[name=old_pwd]").focus(); self.$option_id.find('form[name=change_pwd_form]').submit(function(ev) { - ev.preventDefault(); - - var old_pwd = self.$option_id.find("input[name=old_pwd]").val(); - var new_pwd = self.$option_id.find("input[name=new_pwd]").val(); - var confirm_pwd = self.$option_id.find("input[name=confirm_pwd]").val(); - - self.rpc("/base/database/db_operation", {'flag': 'change_password', 'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd}, - function(result) { - if (result && !result.error) { - self.notification.notify("Changed Password", "Password has been changed successfully"); - } else if(result.error) { - var db_error_dialog = _.uniqueId("db_error_dialog"); - $('
', {id: db_error_dialog}).dialog({ - modal: true, - title: result.title, - buttons: { - Ok: function() { - $(this).dialog("close"); - } - } - }).html("
" + result.error + "
"); - } - }); - }); - } - + ev.preventDefault(); + + var old_pwd = self.$option_id.find("input[name=old_pwd]").val(); + var new_pwd = self.$option_id.find("input[name=new_pwd]").val(); + var confirm_pwd = self.$option_id.find("input[name=confirm_pwd]").val(); + + self.rpc("/base/database/change_password_db", {'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd}, + function(result) { + if (result && !result.error) { + self.notification.notify("Changed Password", "Password has been changed successfully"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); + }); + } + }); openerp.base.Login = openerp.base.Controller.extend({ @@ -984,8 +982,8 @@ openerp.base.Login = openerp.base.Controller.extend({ this.$element.closest(".openerp").addClass("login-mode"); this.$element.find('#oe-db-config').click(function() { - self.database = new openerp.base.Database(self, "oe_database", "oe_db_options"); - self.database.start(); + self.database = new openerp.base.Database(self, "oe_database", "oe_db_options"); + self.database.start(); }); this.$element.find("form").submit(this.on_submit); From a5476e974924f9c0094c6952d41d37393f4af334 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 13:50:02 +0530 Subject: [PATCH 087/167] [FIX] Update code for exception handling. bzr revid: noz@tinyerp.com-20110726082002-r5j6cbzzz4lyitzj --- addons/base/controllers/main.py | 33 ++++++----------------------- addons/base/static/src/js/chrome.js | 19 ++++++++++++++--- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 4e4c5b47d39..97b266cecca 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -56,9 +56,6 @@ class Xml2Json: # OpenERP Web base Controllers #---------------------------------------------------------- -class DatabaseCreationError(Exception): pass -class DatabaseCreationCrash(DatabaseCreationError): pass - class Database(openerpweb.Controller): _cp_path = "/base/database" @@ -88,25 +85,9 @@ class Database(openerpweb.Controller): ok = False try: return req.session.proxy("db").create(super_admin_pwd, dbname, demo_data, db_lang, admin_pwd) -# while True: -# try: -# progress, users = req.session.proxy('db').get_progress(super_admin_pwd, res) -# if progress == 1.0: -# for x in users: -# if x['login'] == 'admin': -# req.session.login(dbname, 'admin', x['password']) -# ok = True -# break -# else: -# time.sleep(1) -# except: -# raise DatabaseCreationCrash() -# except DatabaseCreationCrash: -# return {'error': "The server crashed during installation.\nWe suggest you to drop this database.", -# 'title': 'Error during database creation'} except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Create Database'} + return {'error': e.faultCode, 'title': 'Create Database'} else: return {'error': 'Could not create database !', 'title': 'Create Database'} @@ -119,7 +100,7 @@ class Database(openerpweb.Controller): return req.session.proxy("db").drop(password, db) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Drop Database'} + return {'error': e.faultCode, 'title': 'Drop Database'} else: return {'error': 'Could not drop database !', 'title': 'Drop Database'} @@ -135,7 +116,7 @@ class Database(openerpweb.Controller): return base64.decodestring(res) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Backup Database'} + return {'error': e.faultCode, 'title': 'Backup Database'} else: return {'error': 'Could not drop database !', 'title': 'Backup Database'} @@ -150,7 +131,7 @@ class Database(openerpweb.Controller): return req.session.proxy("db").restore(password, db, data) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Restore Database'} + return {'error': e.faultCode, 'title': 'Restore Database'} else: return {'error': 'Could not restore database !', 'title': 'Restore Database'} @@ -164,7 +145,7 @@ class Database(openerpweb.Controller): return req.session.proxy("db").change_admin_password(old_password, new_password) except Exception, e: if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied': - return {'error': 'Bad super admin password !', 'title': 'Change Password'} + return {'error': e.faultCode, 'title': 'Change Password'} else: return {'error': 'Error, password not changed !', 'title': 'Change Password'} @@ -222,8 +203,8 @@ class Session(openerpweb.Controller): try: lang_list = lang_list + (req.session.proxy("db").list_lang() or []) except Exception, e: - pass - return {"lang_list": lang_list} + return {"error": e, "title": "Languages"} + return {"lang_list": lang_list, "error": ""} @openerpweb.jsonrequest def modules(self, req): diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index f9dffcfc66a..5d424c0bccc 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -709,8 +709,21 @@ openerp.base.Database = openerp.base.Controller.extend({ }); this.rpc("/base/session/get_lang_list", {}, function(result) { - self.lang_list = result.lang_list; - self.do_db_create(); + if (!result.error) { + self.lang_list = result.lang_list; + self.do_db_create(); + } else { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } }); this.$element.find('#db-create').click(this.do_db_create); @@ -766,7 +779,7 @@ openerp.base.Database = openerp.base.Controller.extend({ function(result) { if (result && !result.error) { - } else if(result.error) { + } else if(result.error) { var db_error_dialog = _.uniqueId("db_error_dialog"); $('
', {id: db_error_dialog}).dialog({ modal: true, From 9f31d81739e8a7e4db864a5ae3fb78829921df6e Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 14:17:14 +0530 Subject: [PATCH 088/167] [FIX] Removed tabs and added spaces and header string for operation. bzr revid: noz@tinyerp.com-20110726084714-p4u13eevuf5nw4oc --- addons/base/static/src/js/chrome.js | 5 - addons/base/static/src/xml/base.xml | 328 ++++++++++++++-------------- 2 files changed, 164 insertions(+), 169 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 5d424c0bccc..72844f30f04 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -739,7 +739,6 @@ openerp.base.Database = openerp.base.Controller.extend({ do_db_create: function() { var self = this; - self.db_string = "CREATE DATABASE"; self.$option_id.html(QWeb.render("CreateDB", self)); $("form[name=create_db_form]").validate(); @@ -797,7 +796,6 @@ openerp.base.Database = openerp.base.Controller.extend({ do_db_drop: function() { var self = this; - self.db_string = "DROP DATABASE"; self.$option_id.html(QWeb.render("DropDB", self)); $("form[name=drop_db_form]").validate(); @@ -833,7 +831,6 @@ openerp.base.Database = openerp.base.Controller.extend({ do_db_backup: function() { var self = this; - self.db_string = "BACKUP DATABASE"; self.$option_id.html(QWeb.render("BackupDB", self)); $("form[name=backup_db_form]").validate(); @@ -866,7 +863,6 @@ openerp.base.Database = openerp.base.Controller.extend({ do_db_restore: function() { var self = this; - self.db_string = "RESTORE DATABASE"; self.$option_id.html(QWeb.render("RestoreDB", self)); $("form[name=restore_db_form]").validate(); @@ -900,7 +896,6 @@ openerp.base.Database = openerp.base.Controller.extend({ do_change_password: function() { var self = this; - self.db_string = "CHANGE DATABASE PASSWORD"; self.$option_id.html(QWeb.render("Change_DB_Pwd", self)); $("form[name=change_pwd_form]").validate(); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 3baaa01ad4b..de2c9eb029e 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -59,180 +59,180 @@ Loading... -
    -
  • Create
    • -
  • Drop
    • -
  • Backup
    • -
  • Restore
    • -
  • Password
    • -
  • Back to Login
    • -
+
    +
  • Create
    • +
  • Drop
    • +
  • Backup
    • +
  • Restore
    • +
  • Password
    • +
  • Back to Login
    • +
-
- - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
+
+ + + + +
+ CREATE DATABASE +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
-
- - - - -
- -
- - - - - - - - - - - - - - -
-
+
+ + + + +
+ DROP DATABASE +
+ + + + + + + + + + + + + + +
+
-
- - - - -
- -
- - - - - - - - - - - - -
- - - -
-
+
+ + + + +
+ BACKUP DATABASE +
+ + + + + + + + + + + + +
+ + + +
+
-
- - - - -
- -
- - - - - - - - - - - - - - - - -
-
+
+ + + + +
+ RESTORE DATABASE +
+ + + + + + + + + + + + + + + + +
+
-
- - - - -
- -
- - - - - - - - - - - - - - - - -
-
+
+ + + + +
+ CHANGE DATABASE PASSWORD +
+ + + + + + + + + + + + + + + + +
+
From 8c615cd17e17bd3eace089272a674ae3b8d98f78 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 15:59:04 +0530 Subject: [PATCH 089/167] [FIX] Removed clearing the operation area part. bzr revid: noz@tinyerp.com-20110726102904-pd4aq5olbpf9ivs3 --- addons/base/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 72844f30f04..8e9fb8d3a6a 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -692,7 +692,7 @@ openerp.base.Database = openerp.base.Controller.extend({ this._super(parent, element_id); this.option_id = option_id; this.$option_id = $('#' + option_id); - this.$option_id.html(''); + if(this.parent && this.parent.session) { this.session = this.parent.session; } From 42a1093225221e51d3b691917244b2c522eab1ff Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 18:15:23 +0530 Subject: [PATCH 090/167] [FIX] Used jQuery's serializeArray to get the form values. bzr revid: noz@tinyerp.com-20110726124523-8unw7svihn7r159q --- addons/base/controllers/main.py | 64 +++++++++++++-------- addons/base/static/src/js/chrome.js | 86 +++++++++++------------------ 2 files changed, 73 insertions(+), 77 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 97b266cecca..2507f958cdc 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -70,16 +70,21 @@ class Database(openerpweb.Controller): return {"db_list": dbs} @openerpweb.jsonrequest - def create_db(self, req, **kw): + def create_db(self, req, fields): - super_admin_pwd = kw.get('super_admin_pwd') - dbname = kw.get('db') - demo_data = kw.get('demo_data') - db_lang = kw.get('db_lang') - admin_pwd = kw.get('admin_pwd') - confirm_pwd = kw.get('confirm_pwd') - - if not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname): + for field in fields: + if field['name'] == 'super_admin_pwd': + super_admin_pwd = field['value'] + elif field['name'] == 'db_name': + dbname = field['value'] + elif field['name'] == 'demo_data': + demo_data = field['value'] + elif field['name'] == 'db_lang': + db_lang = field['value'] + elif field['name'] == 'create_admin_pwd': + admin_pwd = field['value'] + + if dbname and not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname): return {'error': "You must avoid all accents, space or special characters.", 'title': 'Bad database name'} ok = False @@ -92,9 +97,12 @@ class Database(openerpweb.Controller): return {'error': 'Could not create database !', 'title': 'Create Database'} @openerpweb.jsonrequest - def drop_db(self, req, **kw): - db = kw.get('db') - password = kw.get('password') + def drop_db(self, req, fields): + for field in fields: + if field['name'] == 'drop_db': + db = field['value'] + elif field['name'] == 'drop_pwd': + password = field['value'] try: return req.session.proxy("db").drop(password, db) @@ -105,9 +113,13 @@ class Database(openerpweb.Controller): return {'error': 'Could not drop database !', 'title': 'Drop Database'} @openerpweb.jsonrequest - def backup_db(self, req, **kw): - db = kw.get('db') - password = kw.get('password') + def backup_db(self, req, fields): + for field in fields: + if field['name'] == 'backup_db': + db = field['value'] + elif field['name'] == 'backup_pwd': + password = field['value'] + try: res = req.session.proxy("db").dump(password, db) if res: @@ -121,10 +133,14 @@ class Database(openerpweb.Controller): return {'error': 'Could not drop database !', 'title': 'Backup Database'} @openerpweb.jsonrequest - def restore_db(self, req, **kw): - filename = kw.get('filename') - db = kw.get('db') - password = kw.get('password') + def restore_db(self, req, fields): + for field in fields: + if field['name'] == 'restore_db': + filename = field['value'] + elif field['name'] == 'new_db': + db = field['value'] + elif field['name'] == 'restore_pwd': + password = field['value'] try: data = base64.encodestring(filename.file.read()) @@ -136,10 +152,12 @@ class Database(openerpweb.Controller): return {'error': 'Could not restore database !', 'title': 'Restore Database'} @openerpweb.jsonrequest - def change_password_db(self, req, **kw): - old_password = kw.get('old_password') - new_password = kw.get('new_password') - confirm_password = kw.get('confirm_password') + def change_password_db(self, req, fields): + for field in fields: + if field['name'] == 'old_pwd': + old_password = field['value'] + elif field['name'] == 'new_pwd': + new_password = field['value'] try: return req.session.proxy("db").change_admin_password(old_password, new_password) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 8e9fb8d3a6a..cc6c4831839 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -755,26 +755,9 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=create_db_form]').submit(function(ev) { ev.preventDefault(); - var super_admin_pwd = self.$option_id.find("input[name=super_admin_pwd]").val(); - var db = self.$option_id.find("input[name=db_name]").val(); - var demo_data = self.$option_id.find("input[name=demo_data]:checked"); - var db_lang = self.$option_id.find("select[name=db_lang]").val(); - var admin_pwd = self.$option_id.find("input[name=create_admin_pwd]").val(); - var confirm_pwd = self.$option_id.find("input[name=create_confirm_pwd]").val(); - - if (demo_data.length) - demo_data = 'True'; - else - demo_data = 'False'; + var fields = $(this).serializeArray(); - self.rpc("/base/database/create_db", { - 'super_admin_pwd': super_admin_pwd, - 'db': db, - 'demo_data': demo_data, - 'db_lang': db_lang, - 'admin_pwd': admin_pwd, - 'confirm_pwd': confirm_pwd - }, + self.rpc("/base/database/create_db", {'fields': fields}, function(result) { if (result && !result.error) { @@ -803,29 +786,29 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=drop_db_form]').submit(function(ev) { ev.preventDefault(); - var db = self.$option_id.find("select[name=drop_db]").val(); - var password = self.$option_id.find("input[name=drop_pwd]").val(); - - if (confirm("Do you really want to delete the database: " + db + " ?")) { - self.rpc("/base/database/drop_db", {'db': db, 'password': password}, - function(result) { - if (result && ! result.error) { - self.$option_id.find("select[name=drop_db] :selected").remove(); - self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); - } else if(result.error) { - var db_error_dialog = _.uniqueId("db_error_dialog"); - $('
', {id: db_error_dialog}).dialog({ - modal: true, - title: result.title, - buttons: { - Ok: function() { - $(this).dialog("close"); - } - } - }).html("
" + result.error + "
"); - } - }); - } + var fields = $(this).serializeArray(); + db = $('select[name=drop_db] :selected').val(); + + if (confirm("Do you really want to delete the database: " + db + " ?")) { + self.rpc("/base/database/drop_db", {'fields': fields}, + function(result) { + if (result && ! result.error) { + self.$option_id.find("select[name=drop_db] :selected").remove(); + self.notification.notify("Dropping database", "The database '" + db + "' has been dropped"); + } else if(result.error) { + var db_error_dialog = _.uniqueId("db_error_dialog"); + $('
', {id: db_error_dialog}).dialog({ + modal: true, + title: result.title, + buttons: { + Ok: function() { + $(this).dialog("close"); + } + } + }).html("
" + result.error + "
"); + } + }); + } }); }, @@ -838,10 +821,9 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=backup_db_form]').submit(function(ev) { ev.preventDefault(); - var db = self.$option_id.find("select[name=backup_db]").val(); - var password = self.$option_id.find("input[name=backup_pwd]").val(); + var fields = $(self).serializeArray(); - self.rpc("/base/database/backup_db", {'db': db, 'password': password}, + self.rpc("/base/database/backup_db", {'fields': fields}, function(result) { if (result && !result.error) { self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'"); @@ -870,11 +852,9 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=restore_db_form]').submit(function(ev) { ev.preventDefault(); - var db = self.$option_id.find("input[name=restore_db]").val(); - var password = self.$option_id.find("input[name=restore_pwd]").val(); - var new_db = self.$option_id.find("input[name=new_db]").val(); + var fields = $(self).serializeArray(); - self.rpc("/base/database/restore_db", {'db': db, 'password': password, 'new_db': new_db}, + self.rpc("/base/database/restore_db", {'fields': fields}, function(result) { if (result && !result.error) { self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'"); @@ -923,12 +903,10 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=change_pwd_form]').submit(function(ev) { ev.preventDefault(); - - var old_pwd = self.$option_id.find("input[name=old_pwd]").val(); - var new_pwd = self.$option_id.find("input[name=new_pwd]").val(); - var confirm_pwd = self.$option_id.find("input[name=confirm_pwd]").val(); + + var fields = $(self).serializeArray(); - self.rpc("/base/database/change_password_db", {'old_password': old_pwd, 'new_password': new_pwd, 'confirm_password': confirm_pwd}, + self.rpc("/base/database/change_password_db", {'fields': fields}, function(result) { if (result && !result.error) { self.notification.notify("Changed Password", "Password has been changed successfully"); From 2d73d6241b232acbb28c4c1bf4ddbd4c74a506a1 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Tue, 26 Jul 2011 18:25:08 +0530 Subject: [PATCH 091/167] [FIX] Removed html tags from error popup. bzr revid: noz@tinyerp.com-20110726125508-gwdsshv0xmsrmxac --- addons/base/static/src/js/chrome.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index cc6c4831839..75c34286a80 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -722,7 +722,7 @@ openerp.base.Database = openerp.base.Controller.extend({ $(this).dialog("close"); } } - }).html("
" + result.error + "
"); + }).html(result.error); } }); @@ -771,7 +771,7 @@ openerp.base.Database = openerp.base.Controller.extend({ $(this).dialog("close"); } } - }).html("
" + result.error + "
"); + }).html(result.error); } }); }); @@ -805,7 +805,7 @@ openerp.base.Database = openerp.base.Controller.extend({ $(this).dialog("close"); } } - }).html("
" + result.error + "
"); + }).html(result.error); } }); } @@ -821,7 +821,7 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=backup_db_form]').submit(function(ev) { ev.preventDefault(); - var fields = $(self).serializeArray(); + var fields = $(this).serializeArray(); self.rpc("/base/database/backup_db", {'fields': fields}, function(result) { @@ -837,7 +837,7 @@ openerp.base.Database = openerp.base.Controller.extend({ $(this).dialog("close"); } } - }).html("
" + result.error + "
"); + }).html(result.error); } }); }); @@ -852,7 +852,7 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=restore_db_form]').submit(function(ev) { ev.preventDefault(); - var fields = $(self).serializeArray(); + var fields = $(this).serializeArray(); self.rpc("/base/database/restore_db", {'fields': fields}, function(result) { @@ -868,7 +868,7 @@ openerp.base.Database = openerp.base.Controller.extend({ $(this).dialog("close"); } } - }).html("
" + result.error + "
"); + }).html(result.error); } }); }); @@ -904,7 +904,7 @@ openerp.base.Database = openerp.base.Controller.extend({ self.$option_id.find('form[name=change_pwd_form]').submit(function(ev) { ev.preventDefault(); - var fields = $(self).serializeArray(); + var fields = $(this).serializeArray(); self.rpc("/base/database/change_password_db", {'fields': fields}, function(result) { @@ -920,7 +920,7 @@ openerp.base.Database = openerp.base.Controller.extend({ $(this).dialog("close"); } } - }).html("
" + result.error + "
"); + }).html(result.error); } }); }); From 8184aa0154a451d096f37f81ec0db014f8c3479a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 26 Jul 2011 17:37:47 +0200 Subject: [PATCH 092/167] [imp] improved o2m, added auto-save bzr revid: nicolas.vanhoren@openerp.com-20110726153747-2zj63korpu6xct6e --- addons/base/static/src/js/data.js | 15 ++++++++-- addons/base/static/src/js/form.js | 46 +++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index 2e89dacceb8..385bd93d360 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -492,24 +492,33 @@ openerp.base.BufferedDataSet = openerp.base.DataSetStatic.extend({ this.to_create.push(cached); this.cache.push(cached); var to_return = $.Deferred().then(callback); - setTimeout(function() {to_return.resolve({result: cached.id});}, 0); + to_return.resolve({result: cached.id}); return to_return.promise(); }, write: function (id, data, callback) { var self = this; var record = _.detect(this.to_create, function(x) {return x.id === id;}); record = record || _.detect(this.to_write, function(x) {return x.id === id;}); + var dirty = false; if (record) { + for (k in data) { + if (record.values[k] === undefined || record.values[k] !== data[k]) { + dirty = true; + break; + } + } $.extend(record.values, data); } else { + dirty = true; record = {id: id, values: data}; self.to_write.push(record); } var cached = _.detect(this.cache, function(x) {return x.id === id;}); $.extend(cached.values, record.values); - this.on_change(); + if (dirty) + this.on_change(); var to_return = $.Deferred().then(callback); - setTimeout(function () {to_return.resolve({result: true});}, 0); + to_return.resolve({result: true}); return to_return.promise(); }, unlink: function(ids, callback, error_callback) { diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 25dcca611bd..598cdd12c20 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -301,6 +301,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV if (!this.ready) { return false; } + var dirty = false; var invalid = false, values = {}, first_invalid_field = null; @@ -313,6 +314,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV first_invalid_field = f; } } else if (f.touched) { + dirty = true; values[f.name] = f.get_value(); } } @@ -320,18 +322,19 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV first_invalid_field.focus(); this.on_invalid(); return false; - } else { + } else if (dirty) { this.log("About to save", values); if (!this.datarecord.id) { - this.dataset.create(values, function(r) { + return this.dataset.create(values, function(r) { self.on_created(r, success, prepend_on_create); }); } else { - this.dataset.write(this.datarecord.id, values, function(r) { + return this.dataset.write(this.datarecord.id, values, function(r) { self.on_saved(r, success); }); } - return true; + } else { + return false; } }, do_save_edit: function() { @@ -1612,6 +1615,9 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ controller.on_record_loaded.add_last(function() { once.resolve(); }); + controller.on_form_changed.add_last(function() { + self.save_form_view(); + }); } self.is_started.resolve(); }); @@ -1692,6 +1698,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ var self = this; if (!this.dataset) return []; + this.save_form_view(); var val = this.dataset.delete_all ? [commands.delete_all()] : []; val = val.concat(_.map(this.dataset.ids, function(id) { var alter_order = _.detect(self.dataset.to_create, function(x) {return x.id === id;}); @@ -1708,9 +1715,38 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ this.dataset.to_delete, function(x) { return commands['delete'](x.id);})); }, + save_form_view: function() { + if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view && + this.viewmanager.views[this.viewmanager.active_view] && + this.viewmanager.views[this.viewmanager.active_view].controller) { + var view = this.viewmanager.views[this.viewmanager.active_view].controller; + if (this.viewmanager.active_view === "form") { + var res = view.do_save(); + if (res === false) { + // ignore + } else if (res.isRejected()) { + throw "Save or create on one2many dataset is not supposed to fail."; + } else if (!res.isResolved()) { + throw "Asynchronous get_value() is not supported in form view."; + } + } + } + }, validate: function() { this.invalid = false; - // TODO niv + var self = this; + var view = self.viewmanager.views[self.viewmanager.active_view].controller; + if(self.viewmanager.active_view === "list") { + return; + } else if (self.viewmanager.active_view === "form") { + for (var f in view.fields) { + f = view.fields[f]; + if (f.invalid) { + this.invalid = true; + return; + } + } + } } }); From d0234fa5dd424e7722443fda7e41f955d857027a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 26 Jul 2011 23:00:05 +0200 Subject: [PATCH 093/167] [IMP] new Sidebar controller Now, the views are responsible of the management of their own sidebar. There is one sidebar per view. The viewmanager creates the divs for each sidebar (as it does for each view). The new Sidebar controller allows custom section with their own controller. bzr revid: fme@openerp.com-20110726210005-xyalvw764y2xhvte --- addons/base/static/src/css/base.css | 4 + addons/base/static/src/js/form.js | 130 +++++++++++++---------- addons/base/static/src/js/list.js | 19 ++-- addons/base/static/src/js/views.js | 157 ++++++++++++++++------------ addons/base/static/src/xml/base.xml | 54 +++++----- 5 files changed, 210 insertions(+), 154 deletions(-) diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index dbb7d101f96..bbf8cba0fe7 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -1020,6 +1020,10 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */ .openerp .closed-sidebar .toggle-sidebar { border-left: none; } +.openerp li.oe_sidebar_print { + padding-left: 20px; + background: 1px 3px url(../img/icons/gtk-print.png) no-repeat; +} .openerp.kitten-mode-activated .main_table { background: url(http://placekitten.com/g/1500/800) repeat; diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 25dcca611bd..e66a073643c 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1,7 +1,7 @@ openerp.base.form = function (openerp) { openerp.base.views.add('form', 'openerp.base.FormView'); -openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormView# */{ +openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormView# */{ /** * Indicates that this view is not searchable, and thus that no search * view should be displayed (if there is one active). @@ -19,6 +19,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV */ init: function(parent, element_id, dataset, view_id, options) { this._super(parent, element_id); + this.set_default_options(); this.view_manager = parent || new openerp.base.NullViewManager(); this.dataset = dataset; this.model = dataset.model; @@ -53,10 +54,14 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV context.add(this.view_manager.action.context); } return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id, - toolbar:!!this.flags.sidebar, context: context}, this.on_loaded); + toolbar: this.options.sidebar, context: context}, this.on_loaded); } }, stop: function() { + if (this.sidebar) { + this.sidebar.attachments.stop(); + this.sidebar.stop(); + } _.each(this.widgets, function(w) { w.stop(); }); @@ -85,12 +90,16 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV $('' + openerp.base.json_node_to_xml(self.fields_view.arch, true) + '').dialog({ width: '95%', height: 600}); }); - if(this.view_manager.sidebar) - this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar); + if (this.options.sidebar && this.options.sidebar_id) { + this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id); + this.sidebar.start(); + this.sidebar.attachments = new openerp.base.form.SidebarAttachments(this.sidebar, this.sidebar.add_section("Attachments"), this); + this.sidebar.add_toolbar(data.fields_view.toolbar); + this.sidebar.do_unfold(); + } this.has_been_loaded.resolve(); }, do_show: function () { - var self = this; var promise; if (this.dataset.index === null) { // null index means we should start a new record @@ -98,13 +107,17 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV } else { promise = this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded); } - self.$element.show(); - if(this.view_manager.sidebar) - this.view_manager.sidebar.do_refresh(true); + this.$element.show(); + if (this.sidebar) { + this.sidebar.$element.show(); + } return promise; }, do_hide: function () { this.$element.hide(); + if (this.sidebar) { + this.sidebar.$element.hide(); + } }, on_record_loaded: function(record) { if (!record) { @@ -144,7 +157,9 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV this.on_form_changed(); this.show_invalid = this.ready = true; this.do_update_pager(record.id == null); - this.do_update_sidebar(); + if (this.sidebar) { + this.sidebar.attachments.do_update(); + } if (this.default_focus_field) { this.default_focus_field.focus(); } @@ -389,7 +404,9 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV this.dataset.index = 0; } this.do_update_pager(); - this.do_update_sidebar(); + if (this.sidebar) { + this.sidebar.attachments.do_update(); + } this.notification.notify("Record created", "The record has been created with id #" + this.datarecord.id); if (success) { success(_.extend(r, {created: true})); @@ -406,51 +423,6 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV do_cancel: function () { this.notification.notify("Cancelling form"); }, - do_update_sidebar: function() { - if (this.flags.sidebar === false || this.view_manager.sidebar === undefined) { - return; - } - if (!this.datarecord.id) { - this.on_attachments_loaded([]); - } else { - (new openerp.base.DataSetSearch( - this, 'ir.attachment', this.dataset.get_context(), - [['res_model', '=', this.dataset.model], - ['res_id', '=', this.datarecord.id], - ['type', 'in', ['binary', 'url']]])).read_slice( - ['name', 'url', 'type'], false, false, - this.on_attachments_loaded); - } - }, - on_attachments_loaded: function(attachments) { - this.$sidebar = this.view_manager.sidebar.$element.find('.sidebar-attachments'); - this.attachments = attachments; - this.$sidebar.html(QWeb.render('FormView.sidebar.attachments', this)); - this.$sidebar.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete); - this.$sidebar.find('.oe-binary-file').change(this.on_attachment_changed); - }, - on_attachment_changed: function(e) { - window[this.element_id + '_iframe'] = this.do_update_sidebar; - var $e = $(e.target); - if ($e.val() != '') { - this.$sidebar.find('form.oe-binary-form').submit(); - $e.parent().find('input[type=file]').attr('disabled', 'true'); - $e.parent().find('button').attr('disabled', 'true').find('img, span').toggle(); - } - }, - on_attachment_delete: function(e) { - var self = this, $e = $(e.currentTarget); - var name = _.trim($e.parent().find('a.oe-sidebar-attachments-link').text()); - if (confirm("Do you really want to delete the attachment " + name + " ?")) { - this.rpc('/base/dataset/unlink', { - model: 'ir.attachment', - ids: [parseInt($e.attr('data-id'))] - }, function(r) { - $e.parent().remove(); - self.notification.notify("Delete an attachment", "The attachment '" + name + "' has been deleted"); - }); - } - }, reload: function() { if (this.datarecord.id) { this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded); @@ -471,6 +443,54 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV /** @namespace */ openerp.base.form = {}; +openerp.base.form.SidebarAttachments = openerp.base.Controller.extend({ + init: function(parent, element_id, form_view) { + this._super(parent, element_id); + this.view = form_view; + }, + do_update: function() { + if (!this.view.datarecord.id) { + this.on_attachments_loaded([]); + } else { + (new openerp.base.DataSetSearch( + this, 'ir.attachment', this.view.dataset.get_context(), + [['res_model', '=', this.view.dataset.model], + ['res_id', '=', this.view.datarecord.id], + ['type', 'in', ['binary', 'url']]])).read_slice( + ['name', 'url', 'type'], false, false, + this.on_attachments_loaded); + } + }, + on_attachments_loaded: function(attachments) { + this.attachments = attachments; + this.$element.html(QWeb.render('FormView.sidebar.attachments', this)); + this.$element.find('.oe-binary-file').change(this.on_attachment_changed); + this.$element.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete); + }, + on_attachment_changed: function(e) { + window[this.element_id + '_iframe'] = this.do_update; + var $e = $(e.target); + if ($e.val() != '') { + this.$element.find('form.oe-binary-form').submit(); + $e.parent().find('input[type=file]').attr('disabled', 'true'); + $e.parent().find('button').attr('disabled', 'true').find('img, span').toggle(); + } + }, + on_attachment_delete: function(e) { + var self = this, $e = $(e.currentTarget); + var name = _.trim($e.parent().find('a.oe-sidebar-attachments-link').text()); + if (confirm("Do you really want to delete the attachment " + name + " ?")) { + this.rpc('/base/dataset/unlink', { + model: 'ir.attachment', + ids: [parseInt($e.attr('data-id'))] + }, function(r) { + $e.parent().remove(); + self.notification.notify("Delete an attachment", "The attachment '" + name + "' has been deleted"); + }); + } + } +}); + openerp.base.form.compute_domain = function(expr, fields) { var stack = []; for (var i = expr.length - 1; i >= 0; i--) { diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index a2fca3aa89e..a4e516721ca 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -102,6 +102,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi */ init: function(parent, element_id, dataset, view_id, options) { this._super(parent, element_id); + this.set_default_options(); this.view_manager = parent || new openerp.base.NullViewManager(); this.dataset = dataset; this.model = dataset.model; @@ -267,9 +268,11 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi }) .val(self._limit || 'NaN'); }); - if(this.view_manager.sidebar) - this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar); - + if (this.options.sidebar && this.options.sidebar_id) { + this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id); + this.sidebar.start(); + this.sidebar.add_toolbar(data.fields_view.toolbar); + } }, /** * Configures the ListView pager based on the provided dataset's information @@ -393,16 +396,20 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi }, do_show: function () { this.$element.show(); + if (this.sidebar) { + this.sidebar.$element.show(); + } if (this.hidden) { this.$element.find('.oe-listview-content').append( this.groups.apoptosis().render()); this.hidden = false; } - if(this.view_manager.sidebar) - this.view_manager.sidebar.do_refresh(true); }, do_hide: function () { this.$element.hide(); + if (this.sidebar) { + this.sidebar.$element.hide(); + } this.hidden = true; }, /** @@ -422,7 +429,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi model: this.model, view_id: this.view_id, context: this.dataset.get_context(), - toolbar: !!this.flags.sidebar + toolbar: this.options.sidebar }, callback); } }, diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 1b5452bb5a3..b98b0bc637f 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -120,7 +120,6 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;}); this.views = {}; this.flags = this.flags || {}; - this.sidebar = new openerp.base.NullSidebar(); this.registry = openerp.base.views; }, /** @@ -134,7 +133,12 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ self.on_mode_switch($(this).data('view-type')); }); _.each(this.views_src, function(view) { - self.views[view.view_type] = $.extend({}, view, {controller: null}); + self.views[view.view_type] = $.extend({}, view, { + controller : null, + options : _.extend({ + sidebar_id : self.element_id + '_sidebar_' + view.view_type + }, self.flags) + }); }); if (this.flags.views_switcher === false) { this.$element.find('.oe_vm_switch').hide(); @@ -158,7 +162,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({ if (!view.controller) { // Lazy loading of views var controllerclass = this.registry.get_object(view_type); - var controller = new controllerclass( this, this.element_id + "_view_" + view_type, + var controller = new controllerclass(this, this.element_id + '_view_' + view_type, this.dataset, view.view_id, view.options); if (view.embedded_view) { controller.set_embedded_view(view.embedded_view); @@ -275,7 +279,6 @@ openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.b if(parent) this.session = parent.session; this.action = {flags: {}}; - this.sidebar = new openerp.base.NullSidebar(); } }); @@ -300,19 +303,10 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ // Not elegant but allows to avoid flickering of SearchView#do_hide this.flags.search_view = this.flags.pager = this.flags.sidebar = this.flags.action_buttons = false; } - if (this.flags.sidebar) { - this.sidebar = new openerp.base.Sidebar(null, this); - } }, start: function() { var inital_view_loaded = this._super(); - // init sidebar - if (this.flags.sidebar) { - this.$element.find('.view-manager-main-sidebar').html(this.sidebar.render()); - this.sidebar.start(); - } - var search_defaults = {}; _.each(this.action.context, function (value, key) { var match = /^search_default_(.*)$/.exec(key); @@ -337,7 +331,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ }, stop: function() { // should be replaced by automatic destruction implemented in BaseWidget - this.sidebar.stop(); this._super(); }, /** @@ -364,62 +357,88 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ } }); -openerp.base.Sidebar = openerp.base.BaseWidget.extend({ - template: "ViewManager.sidebar", - init: function(parent, view_manager) { - this._super(parent, view_manager.session); - this.view_manager = view_manager; - this.sections = []; - }, - set_toolbar: function(toolbar) { - this.sections = []; - var self = this; - _.each([["print", "Reports"], ["action", "Actions"], ["relate", "Links"]], function(type) { - if (toolbar[type[0]].length == 0) - return; - var section = {elements:toolbar[type[0]], label:type[1]}; - self.sections.push(section); - }); - this.do_refresh(true); - }, - do_refresh: function(new_view) { - var view = this.view_manager.active_view; - var the_condition = this.sections.length > 0 && _.detect(this.sections, - function(x) {return x.elements.length > 0;}) != undefined - && (!new_view || view != 'list'); - - this.$element.toggleClass('open-sidebar', the_condition) - .toggleClass('closed-sidebar', !the_condition); - - this.$element.html(QWeb.render("ViewManager.sidebar.internal", { sidebar: this, view: view })); - - var self = this; - this.$element.find(".toggle-sidebar").click(function(e) { - self.$element.toggleClass('open-sidebar closed-sidebar'); - e.stopPropagation(); - e.preventDefault(); - }); - - this.$element.find("a.oe_sidebar_action_a").click(function(e) { - var $this = jQuery(this); - var index = $this.attr("data-index").split('-'); - var action = self.sections[index[0]].elements[index[1]]; - action.flags = { - new_window : true - }; - self.session.action_manager.do_action(action); - e.stopPropagation(); - e.preventDefault(); - }); +openerp.base.Sidebar = openerp.base.Controller.extend({ + init: function(parent, element_id) { + this._super(parent, element_id); + this.items = {}; }, start: function() { - this._super(); - this.do_refresh(false); + var self = this; + this._super(this, arguments); + this.$element.html(QWeb.render('Sidebar')); + this.$element.find(".toggle-sidebar").click(function(e) { + self.do_toggle(); + }); + }, + add_toolbar: function(toolbar) { + var self = this; + _.each([['print', "Reports"], ['action', "Actions"], ['relate', "Links"]], function(type) { + var items = toolbar[type[0]]; + if (items.length) { + for (var i = 0; i < items.length; i++) { + items[i] = { + label: items[i]['name'], + action: items[i], + classname: 'oe_sidebar_' + type[0] + } + } + self.add_section(type[1], items); + } + }); + }, + add_section: function(name, items) { + // For each section, we pass a name/label and optionally an array of items. + // If no items are passed, then the section will be created as a custom section + // returning back an element_id to be used by a custom controller. + // Else, the section is a standard section with items displayed as links. + // An item is a dictonary : { + // label: label to be displayed for the link, + // action: action to be launch when the link is clicked, + // callback: a function to be executed when the link is clicked, + // classname: optionnal dom class name for the line, + // } + // Note: The item should have one action or/and a callback + var self = this, + section_id = _.uniqueId(this.element_id + '_section_'); + if (items) { + for (var i = 0; i < items.length; i++) { + items[i].element_id = _.uniqueId(section_id + '_item_'); + this.items[items[i].element_id] = items[i]; + } + } + var $section = $(QWeb.render("Sidebar.section", { + section_id: section_id, + name: name, + items: items + })); + if (items) { + $section.find('a.oe_sidebar_action_a').click(function() { + var item = self.items[$(this).attr('id')]; + if (item.callback) { + item.callback(); + } + if (item.action) { + item.action.flags = item.action.flags || {}; + item.action.flags.new_window = true; + self.do_action(item.action); + } + return false; + }); + } + $section.appendTo(this.$element.find('div.sidebar-actions')); + return section_id; + }, + do_fold: function() { + this.$element.addClass('closed-sidebar').removeClass('open-sidebar'); + }, + do_unfold: function() { + this.$element.addClass('open-sidebar').removeClass('closed-sidebar'); + }, + do_toggle: function() { + this.$element.toggleClass('open-sidebar closed-sidebar'); } }); -openerp.base.NullSidebar = openerp.base.generate_null_object_class(openerp.base.Sidebar); - openerp.base.Export = openerp.base.Dialog.extend({ dialog_title: "Export", template: 'ExportDialog', @@ -440,6 +459,14 @@ openerp.base.Export = openerp.base.Dialog.extend({ }); openerp.base.View = openerp.base.Controller.extend({ + set_default_options: function(options) { + this.options = options || {}; + _.defaults(this.options, { + // All possible views options should be defaulted here + sidebar_id: null, + sidebar: true + }); + }, /** * Fetches and executes the action identified by ``action_data``. * diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 0f7c3f3d51f..10d1539cde1 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -232,10 +232,32 @@
+ +
+ + +
+
+
+
+ + +

+
+ +
+ @@ -360,21 +382,20 @@ -

Attachments

- - + + + t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
@@ -384,7 +405,7 @@
  • + + '&field=datas&fieldname=name&t=' + (new Date().getTime())"/> @@ -849,29 +870,6 @@ - -
    - -
    -     - - -
    -
    -
    - -

    - -     -
    -
    -
    • From c918d3d9fc17220a33d3284a7b3f391269cdb3cf Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Wed, 27 Jul 2011 11:02:00 +0530 Subject: [PATCH 094/167] [FIX] Removed import line validate.js bzr revid: noz@tinyerp.com-20110727053200-2go93hie4ad4p7yq --- addons/base/static/src/base.html | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html index e26196f1005..0c615ed8903 100644 --- a/addons/base/static/src/base.html +++ b/addons/base/static/src/base.html @@ -13,7 +13,6 @@ --> - From 30bca6090729aec58e7076443cc751e09678d860 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 10:03:19 +0200 Subject: [PATCH 095/167] [REM] Removed reference to view_manager.flags from views. The action flags are merged in View's options constructor argument so we shall not fetch them from view_manager anymore. bzr revid: fme@openerp.com-20110727080319-nztgq4txu2tt6odq --- addons/base/static/src/js/form.js | 1 - addons/base/static/src/js/list.js | 1 - addons/base/static/test/list.js | 25 ++++++------------------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index e66a073643c..6cc208facda 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -32,7 +32,6 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi this.ready = false; this.show_invalid = true; this.touched = false; - this.flags = this.view_manager.flags || {}; this.default_focus_field = null; this.default_focus_button = null; this.registry = openerp.base.form.widgets; diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index a4e516721ca..0c595bed22d 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -111,7 +111,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi this.columns = []; this.options = _.extend({}, this.defaults, options || {}); - this.flags = this.view_manager.flags || {}; this.set_groups(new openerp.base.ListView.Groups(this)); diff --git a/addons/base/static/test/list.js b/addons/base/static/test/list.js index 3d441f190db..ebce7e8535a 100644 --- a/addons/base/static/test/list.js +++ b/addons/base/static/test/list.js @@ -18,15 +18,6 @@ $(document).ready(function () { } }}; - var fuck_that_shit = { - action: { - flags: {} - }, - sidebar: { - set_toolbar: function () {} - } - }; - var openerp; module("ListView", { setup: function () { @@ -42,8 +33,7 @@ $(document).ready(function () { test('render selection checkboxes', 2, function () { var listview = new openerp.base.ListView( - fuck_that_shit, null, - 'qunit-fixture', {model: null, ids: [null, null, null], index: 0}); + null, 'qunit-fixture', {model: null, ids: [null, null, null], index: 0}); listview.on_loaded(fvg); @@ -60,8 +50,7 @@ $(document).ready(function () { }); test('render no checkbox if selectable=false', 1, function () { var listview = new openerp.base.ListView( - fuck_that_shit, null, - 'qunit-fixture', {model: null, ids: [null, null, null], index: 0}, false, + null, 'qunit-fixture', {model: null, ids: [null, null, null], index: 0}, false, {selectable: false}); listview.on_loaded(fvg); @@ -75,8 +64,7 @@ $(document).ready(function () { }); test('select a bunch of records', 2, function () { var listview = new openerp.base.ListView( - fuck_that_shit, null, 'qunit-fixture', - {model: null, ids: [1, 2, 3], index: 0}); + null, 'qunit-fixture', {model: null, ids: [1, 2, 3], index: 0}); listview.on_loaded(fvg); listview.do_fill_table({records: [ @@ -94,8 +82,7 @@ $(document).ready(function () { }); test('render deletion button if list is deletable', 1, function () { var listview = new openerp.base.ListView( - fuck_that_shit, null, 'qunit-fixture', - {model: null, ids: [null, null, null], index: 0}); + null, 'qunit-fixture', {model: null, ids: [null, null, null], index: 0}); listview.on_loaded(fvg); @@ -112,7 +99,7 @@ $(document).ready(function () { 2, function () { var deleted; var listview = new openerp.base.ListView( - fuck_that_shit, null, 'qunit-fixture', + null, 'qunit-fixture', {model: null, unlink: function (ids) { deleted = ids; }, ids: [1, 2, 3], index: 0}); @@ -132,7 +119,7 @@ $(document).ready(function () { test('multiple records deletion', 1, function () { var deleted; var listview = new openerp.base.ListView( - fuck_that_shit, null, 'qunit-fixture', + null, 'qunit-fixture', {model: null, unlink: function (ids) { deleted = ids; }, ids: [1, 2, 3], index: 0}); From 87206f1fd59a65952435ebf4ccd80ced8151d204 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 10:14:48 +0200 Subject: [PATCH 096/167] [FIX] Forgot some flags reference in previous commit bzr revid: fme@openerp.com-20110727081448-fbspxdyx1oefmus4 --- addons/base/static/src/xml/base.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 10d1539cde1..e34c20dcb8a 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -261,11 +261,11 @@
    - +
    - - +
    + + -
    +
    -
    +
    From c9f7de4dea76cbca6369907e343605f2ed9685f9 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 27 Jul 2011 11:09:05 +0200 Subject: [PATCH 097/167] [fix] some bugs related to validation + removed save button in o2m bzr revid: nicolas.vanhoren@openerp.com-20110727090905-adbyclomw24uaj5a --- addons/base/static/src/js/form.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 5c14b953b70..be09c5741d2 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -827,10 +827,12 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({ }, update_dom: function() { this._super.apply(this, arguments); - this.$element.toggleClass('disabled', this.readonly); - this.$element.toggleClass('required', this.required); - if (this.view.show_invalid) { - this.$element.toggleClass('invalid', this.invalid); + if (!this.disable_utility_classes) { + this.$element.toggleClass('disabled', this.readonly); + this.$element.toggleClass('required', this.required); + if (this.view.show_invalid) { + this.$element.toggleClass('invalid', this.invalid); + } } }, on_ui_change: function() { @@ -1589,6 +1591,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ this.template = "FieldOne2Many"; this.is_started = $.Deferred(); this.form_last_update = $.Deferred(); + this.disable_utility_classes = true; }, start: function() { this._super.apply(this, arguments); @@ -1635,8 +1638,12 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ once.resolve(); }); controller.on_form_changed.add_last(function() { - self.save_form_view(); + if (self.save_form_view() === false) { + // we assume one value was changed to invalid state + self.validate(); + } }); + controller.$element.find(".oe_form_button_save_edit").hide(); } self.is_started.resolve(); }); @@ -1709,6 +1716,9 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ this._super(value); this.dataset.reset_ids(value); } + if (this.dataset.index === null && this.dataset.ids.length > 0) { + this.dataset.index = 0; + } $.when(this.is_started).then(function() { self.reload_current_view(); }); @@ -1717,7 +1727,6 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ var self = this; if (!this.dataset) return []; - this.save_form_view(); var val = this.dataset.delete_all ? [commands.delete_all()] : []; val = val.concat(_.map(this.dataset.ids, function(id) { var alter_order = _.detect(self.dataset.to_create, function(x) {return x.id === id;}); @@ -1748,8 +1757,10 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ } else if (!res.isResolved()) { throw "Asynchronous get_value() is not supported in form view."; } + return res; } } + return false; }, validate: function() { this.invalid = false; @@ -1766,6 +1777,10 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ } } } + }, + update_dom: function() { + this._super.apply(this, arguments); + this.$element.toggleClass('disabled', this.readonly); } }); From 9d6085e99e6436a9b5b9edc96050eba46d896436 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 11:28:01 +0200 Subject: [PATCH 098/167] [REM] Removed debug logging in dialog function bzr revid: fme@openerp.com-20110727092801-fg93veg1rcox72z7 --- addons/base/static/src/js/form.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 5c14b953b70..c8d205b9492 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1289,7 +1289,6 @@ openerp.base.form.dialog = function(content, options) { options.autoOpen = true; var dialog = new openerp.base.Dialog(null, options); dialog.$dialog = $(content).dialog(dialog.options); - console.log(dialog.options) return dialog.$dialog; } From 62e969578f89d9a3440dd694fe909b3e5a9f43fc Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 27 Jul 2011 11:30:14 +0200 Subject: [PATCH 099/167] [fix] small inconsistency with deferred in dataset bzr revid: nicolas.vanhoren@openerp.com-20110727093014-fe1uhbkcyxl86qyz --- addons/base/static/src/js/data.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index 385bd93d360..9eb08cf0fde 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -291,14 +291,18 @@ openerp.base.DataSet = openerp.base.Controller.extend( /** @lends openerp.base. * Read the indexed record. */ read_index: function (fields, callback) { + var def = $.Deferred().then(callback); if (_.isEmpty(this.ids)) { - return $.Deferred().reject().promise(); + def.reject(); } else { fields = fields || false; - return this.read_ids([this.ids[this.index]], fields, function(records) { - callback(records[0]); + return this.read_ids([this.ids[this.index]], fields).then(function(records) { + def.resolve(records[0]); + }, function() { + def.reject.apply(def, arguments); }); } + return def.promise(); }, default_get: function(fields, callback) { return this.rpc('/base/dataset/default_get', { From 216ab84e5f27927ff1bf664ac8bdf38bbed57897 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 12:25:19 +0200 Subject: [PATCH 100/167] [FIX] Fixed niv's mood bzr revid: fme@openerp.com-20110727102519-at3qxx4sxc3fqp44 --- addons/base/static/src/js/form.js | 56 +++++++++++++++++-------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index c8d205b9492..d5a87a78309 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -31,7 +31,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi this.datarecord = {}; this.ready = false; this.show_invalid = true; - this.touched = false; + this.dirty = false; this.default_focus_field = null; this.default_focus_button = null; this.registry = openerp.base.form.widgets; @@ -133,22 +133,22 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi this.$form_header.find('.oe_form_on_update').show(); this.$form_header.find('button.oe_form_button_new').show(); } - this.touched = false; + this.dirty = false; this.datarecord = record; for (var f in this.fields) { var field = this.fields[f]; - field.touched = false; + field.dirty = false; field.set_value(this.datarecord[f] || false); field.validate(); } if (!record.id) { // New record: Second pass in order to trigger the onchanges - this.touched = true; + this.dirty = true; this.show_invalid = false; for (var f in record) { var field = this.fields[f]; if (field) { - field.touched = true; + field.dirty = true; this.do_onchange(field); } } @@ -267,7 +267,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi processed.push(field.name); if (field.get_value() != value) { field.set_value(value); - field.touched = true; + field.dirty = true; if (_.indexOf(processed, field.name) < 0) { this.do_onchange(field, processed); } @@ -315,28 +315,28 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi if (!this.ready) { return false; } - var dirty = false; - var invalid = false, + var form_dirty = false, + form_invalid = false, values = {}, first_invalid_field = null; for (var f in this.fields) { f = this.fields[f]; - if (f.invalid) { - invalid = true; + if (!f.is_valid()) { + form_invalid = true; f.update_dom(); if (!first_invalid_field) { first_invalid_field = f; } - } else if (f.touched) { - dirty = true; + } else if (f.is_dirty()) { + form_dirty = true; values[f.name] = f.get_value(); } } - if (invalid) { + if (form_invalid) { first_invalid_field.focus(); this.on_invalid(); return false; - } else if (dirty) { + } else if (form_dirty) { this.log("About to save", values); if (!this.datarecord.id) { return this.dataset.create(values, function(r) { @@ -362,7 +362,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi on_invalid: function() { var msg = "
      "; _.each(this.fields, function(f) { - if (f.invalid) { + if (!f.is_valid()) { msg += "
    • " + f.string + "
      • "; } }); @@ -729,7 +729,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({ }, on_click: function(saved) { var self = this; - if (!this.node.attrs.special && this.view.touched && saved !== true) { + if (!this.node.attrs.special && this.view.dirty && saved !== true) { this.view.do_save(function() { self.on_click(true); }); @@ -809,7 +809,7 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({ this.readonly = this.modifiers['readonly'] === true; this.required = this.modifiers['required'] === true; this.invalid = false; - this.touched = false; + this.dirty = false; }, set_value: function(value) { this.value = value; @@ -822,6 +822,12 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({ get_value: function() { return this.value; }, + is_valid: function() { + return !this.invalid; + }, + is_dirty: function() { + return this.dirty; + }, get_on_change_value: function() { return this.get_value(); }, @@ -830,13 +836,13 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({ this.$element.toggleClass('disabled', this.readonly); this.$element.toggleClass('required', this.required); if (this.view.show_invalid) { - this.$element.toggleClass('invalid', this.invalid); + this.$element.toggleClass('invalid', !this.is_valid()); } }, on_ui_change: function() { - this.touched = this.view.touched = true; + this.dirty = this.view.dirty = true; this.validate(); - if (!this.invalid) { + if (this.is_valid()) { this.set_value_from_ui(); this.view.do_onchange(this); this.view.on_form_changed(); @@ -934,7 +940,7 @@ openerp.base.form.FieldEmail = openerp.base.form.FieldChar.extend({ this.$element.find('button').click(this.on_button_clicked); }, on_button_clicked: function() { - if (!this.value || this.invalid) { + if (!this.value || !this.is_valid()) { this.notification.warn("E-mail error", "Can't send email to invalid e-mail address"); } else { location.href = 'mailto:' + this.value; @@ -975,7 +981,7 @@ openerp.base.form.FieldFloat = openerp.base.form.FieldChar.extend({ if (value === false || value === undefined) { // As in GTK client, floats default to 0 value = 0; - this.touched = true; + this.dirty = true; } var show_value = value.toFixed(2); this.$element.find('input').val(show_value); @@ -995,7 +1001,7 @@ openerp.base.form.FieldInteger = openerp.base.form.FieldFloat.extend({ if (value === false || value === undefined) { // TODO fme: check if GTK client default integers to 0 (like it does with floats) value = 0; - this.touched = true; + this.dirty = true; } var show_value = parseInt(value, 10); this.$element.find('input').val(show_value); @@ -1082,7 +1088,7 @@ openerp.base.form.FieldFloatTime = openerp.base.form.FieldChar.extend({ if (value === false || value === undefined) { // As in GTK client, floats default to 0 value = 0; - this.touched = true; + this.dirty = true; } var show_value = _.sprintf("%02d:%02d", Math.floor(value), Math.round((value % 1) * 60)); this.$element.find('input').val(show_value); @@ -1759,7 +1765,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ } else if (self.viewmanager.active_view === "form") { for (var f in view.fields) { f = view.fields[f]; - if (f.invalid) { + if (!f.is_valid()) { this.invalid = true; return; } From 278a0b6a674e41f47856ba92e950dd45d8e515b5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 27 Jul 2011 14:22:29 +0200 Subject: [PATCH 101/167] [fix] removed auto-save and put save on get_value() bzr revid: nicolas.vanhoren@openerp.com-20110727122229-hqdh03hux2lu6a3t --- addons/base/static/src/js/form.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index be09c5741d2..5b21ecb7e45 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1638,10 +1638,9 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ once.resolve(); }); controller.on_form_changed.add_last(function() { - if (self.save_form_view() === false) { - // we assume one value was changed to invalid state - self.validate(); - } + // may not be the better solution but I can't imagine a better one, + // auto-save in form view is way harder to do anyway + self.on_ui_change(); }); controller.$element.find(".oe_form_button_save_edit").hide(); } @@ -1727,6 +1726,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ var self = this; if (!this.dataset) return []; + self.save_form_view() var val = this.dataset.delete_all ? [commands.delete_all()] : []; val = val.concat(_.map(this.dataset.ids, function(id) { var alter_order = _.detect(self.dataset.to_create, function(x) {return x.id === id;}); From f93d975835e5e50fb8a572e8512768ea5c1435b8 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 27 Jul 2011 15:36:28 +0200 Subject: [PATCH 102/167] [imp] used is_valid() and is_dirty() bzr revid: nicolas.vanhoren@openerp.com-20110727133628-jked4rp8uvot9951 --- addons/base/static/src/js/form.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 2fbe0009f2f..4645a88d665 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1642,11 +1642,6 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ controller.on_record_loaded.add_last(function() { once.resolve(); }); - controller.on_form_changed.add_last(function() { - // may not be the better solution but I can't imagine a better one, - // auto-save in form view is way harder to do anyway - self.on_ui_change(); - }); controller.$element.find(".oe_form_button_save_edit").hide(); } self.is_started.resolve(); @@ -1731,7 +1726,6 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ var self = this; if (!this.dataset) return []; - self.save_form_view() var val = this.dataset.delete_all ? [commands.delete_all()] : []; val = val.concat(_.map(this.dataset.ids, function(id) { var alter_order = _.detect(self.dataset.to_create, function(x) {return x.id === id;}); @@ -1767,21 +1761,28 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ } return false; }, - validate: function() { - this.invalid = false; + is_valid: function() { var self = this; var view = self.viewmanager.views[self.viewmanager.active_view].controller; - if(self.viewmanager.active_view === "list") { - return; - } else if (self.viewmanager.active_view === "form") { + if (self.viewmanager.active_view === "form") { for (var f in view.fields) { f = view.fields[f]; if (!f.is_valid()) { - this.invalid = true; - return; + return false; } } } + return true; + }, + is_dirty: function() { + if (!this.dataset) + return false; + this.save_form_view(); + if (this.dataset.delete_all || this.dataset.to_create.length > 0 || this.dataset.to_write.length > 0 + || this.dataset.to_delete > 0) { + return true; + } + return false; }, update_dom: function() { this._super.apply(this, arguments); From d711f510d23b6cd837ccae28614188c11f0aa9b0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 15:57:37 +0200 Subject: [PATCH 103/167] [REM] Removed the view_manager reference in form view. We already have the action context merged in the dataset context. bzr revid: fme@openerp.com-20110727135737-t62q91hjle9ly0hq --- addons/base/static/src/js/form.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index d5a87a78309..cfaeb1e2b3c 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -20,7 +20,6 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi init: function(parent, element_id, dataset, view_id, options) { this._super(parent, element_id); this.set_default_options(); - this.view_manager = parent || new openerp.base.NullViewManager(); this.dataset = dataset; this.model = dataset.model; this.view_id = view_id; @@ -49,9 +48,6 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi return def.promise(); } else { var context = new openerp.base.CompoundContext(this.dataset.get_context()); - if (this.view_manager.action && this.view_manager.action.context) { - context.add(this.view_manager.action.context); - } return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id, toolbar: this.options.sidebar, context: context}, this.on_loaded); } From 0d9150bfa0b62c2a623849d4e4f96c59d239fb89 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 27 Jul 2011 16:03:32 +0200 Subject: [PATCH 104/167] [fix] added save of o2m when using pager & when switching view bzr revid: nicolas.vanhoren@openerp.com-20110727140332-p1blww1imh3irn6u --- addons/base/static/src/js/form.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 4645a88d665..c19e611e42a 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1642,10 +1642,16 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ controller.on_record_loaded.add_last(function() { once.resolve(); }); + controller.on_pager_action.add_first(function() { + self.save_form_view(); + }); controller.$element.find(".oe_form_button_save_edit").hide(); } self.is_started.resolve(); }); + this.viewmanager.on_mode_switch.add_first(function() { + self.save_form_view(); + }); setTimeout(function () { self.viewmanager.start(); }, 0); @@ -1762,27 +1768,26 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ return false; }, is_valid: function() { + this.validate(); + return this._super(); + }, + validate: function() { + this.invalid = false; var self = this; var view = self.viewmanager.views[self.viewmanager.active_view].controller; if (self.viewmanager.active_view === "form") { for (var f in view.fields) { f = view.fields[f]; if (!f.is_valid()) { - return false; + this.invalid = true; + return; } } } - return true; }, is_dirty: function() { - if (!this.dataset) - return false; this.save_form_view(); - if (this.dataset.delete_all || this.dataset.to_create.length > 0 || this.dataset.to_write.length > 0 - || this.dataset.to_delete > 0) { - return true; - } - return false; + return this._super(); }, update_dom: function() { this._super.apply(this, arguments); From 366f3ea01f59ba414dd56c5e831f2ced95e847ce Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 16:31:59 +0200 Subject: [PATCH 105/167] [FIX] Fixed a form layout bug. Labels does not honnor @colspan bzr revid: fme@openerp.com-20110727143159-1sn1yff2dagix9ke --- addons/base/static/src/js/form.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index a8c6cbdb614..d68f75d0549 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -770,11 +770,12 @@ openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({ if (this.node.tag == 'label' && this.node.attrs.colspan) { this.is_field_label = false; this.template = "WidgetParagraph"; + this.colspan = this.node.attrs.colspan; } else { this.is_field_label = true; this.template = "WidgetLabel"; + this.colspan = 1; } - this.colspan = 1; }, render: function () { if (this['for'] && this.type !== 'label') { From cf54b96a62c747e18ad20e005a0d789043bcf49c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 27 Jul 2011 16:33:59 +0200 Subject: [PATCH 106/167] [fix] broken refactoring bzr revid: nicolas.vanhoren@openerp.com-20110727143359-bmfy0uzhti8px9ut --- addons/base/static/src/js/form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index a8c6cbdb614..e79aecf701b 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1475,7 +1475,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ }, self.build_domain(), new openerp.base.CompoundContext(self.build_context(), context || {})); pop.on_select_elements.add(function(element_ids) { - var dataset = new openerp.base.DataSetStatic(this, this.field.relation, self.build_context()); + var dataset = new openerp.base.DataSetStatic(self, self.field.relation, self.build_context()); dataset.name_get([element_ids[0]], function(data) { self._change_int_ext_value(data[0]); pop.stop(); @@ -1854,7 +1854,7 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({ var self = this; - this.dataset = new openerp.base.form.Many2ManyDataSet( this, this.field.relation); + this.dataset = new openerp.base.form.Many2ManyDataSet(this, this.field.relation); this.dataset.m2m = this; this.dataset.on_unlink.add_last(function(ids) { self.on_ui_change(); From 470faa8bc982c83efc73f4a7da818acef18a80e8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 16:37:31 +0200 Subject: [PATCH 107/167] [IMP] Replace underscores in button @string. We don't have buttons keybinding in webclient bzr revid: fme@openerp.com-20110727143731-lky82trxmnnbh4uo --- addons/base/static/src/js/form.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index d146bb98458..80ef7efe96d 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -714,6 +714,10 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({ init: function(view, node) { this._super(view, node); this.template = "WidgetButton"; + if (this.string) { + // We don't have button key bindings in the webclient + this.string = this.string.replace(/_/g, ''); + } if (node.attrs.default_focus == '1') { // TODO fme: provide enter key binding to widgets this.view.default_focus_button = this; From 25af6f34c04b4ac9030324f199a6baa1f93334a7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jul 2011 17:05:42 +0200 Subject: [PATCH 108/167] [FIX] Fix dialog close problems bzr revid: fme@openerp.com-20110727150542-ta6ewb3kji993oh1 --- addons/base/static/src/js/chrome.js | 12 ++++++++++-- addons/base/static/src/js/views.js | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index cc28aea4157..90db0f4abf8 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -544,8 +544,8 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({ max_height: '100%', autoOpen: false, buttons: {}, - close: function () { - self.stop(); + beforeClose: function () { + self.on_close(); } }; for (var f in this) { @@ -609,7 +609,15 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({ this.set_options(options); this.$dialog.dialog(this.options).dialog('open'); }, + close: function() { + // Closes the dialog but leave it in a state where it could be opened again. + this.$dialog.dialog('close'); + }, + on_close: function() { + }, stop: function () { + // Destroy widget + this.close(); this.$dialog.dialog('destroy'); } }); diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index b98b0bc637f..5e1d6be4f61 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -98,11 +98,14 @@ openerp.base.ActionManager = openerp.base.Controller.extend({ openerp.base.ActionDialog = openerp.base.Dialog.extend({ identifier_prefix: 'action_dialog', - stop: function() { + on_close: function() { this._super(this, arguments); if (this.close_callback) { this.close_callback(); } + }, + stop: function() { + this._super(this, arguments); if (this.viewmanager) { this.viewmanager.stop(); } From 2e021069e577040cca87495a1658256558d300b2 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 27 Jul 2011 21:15:15 +0200 Subject: [PATCH 109/167] [IMP] rename base.js into boot.js bzr revid: al@openerp.com-20110727191515-ua17q2qnuy0538fo --- addons/base/__openerp__.py | 2 +- addons/base/static/src/js/{base.js => boot.js} | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename addons/base/static/src/js/{base.js => boot.js} (97%) diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py index a983a4227ce..15c6dae3f1e 100644 --- a/addons/base/__openerp__.py +++ b/addons/base/__openerp__.py @@ -17,7 +17,7 @@ "static/lib/qweb/qweb2.js", "static/lib/underscore/underscore.js", "static/lib/underscore/underscore.string.js", - "static/src/js/base.js", + "static/src/js/boot.js", "static/src/js/chrome.js", "static/src/js/controller.js", "static/src/js/views.js", diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/boot.js similarity index 97% rename from addons/base/static/src/js/base.js rename to addons/base/static/src/js/boot.js index 28022f8b764..6c1dab78fab 100644 --- a/addons/base/static/src/js/base.js +++ b/addons/base/static/src/js/boot.js @@ -1,5 +1,5 @@ //--------------------------------------------------------- -// OpenERP initialisation and black magic about the pool +// OpenERP Web Boostrap //--------------------------------------------------------- /** @@ -57,7 +57,6 @@ // OpenERP base module split //--------------------------------------------------------- -/** @namespace */ openerp.base = function(instance) { openerp.base.controller(instance); openerp.base.dates(instance); From 556d06c65ba0786afbc97732a4bcc8e00b3af082 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 27 Jul 2011 21:52:21 +0200 Subject: [PATCH 110/167] [ADD] niv-style controller/widget skeleton bzr revid: al@openerp.com-20110727195221-gy6u9e4xw0sflh4c --- addons/base/static/src/js/chrome.js | 101 -------- addons/base/static/src/js/controller.js | 301 ++++++++++++++++++++++++ 2 files changed, 301 insertions(+), 101 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 90db0f4abf8..996642385ef 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -136,107 +136,6 @@ openerp.base.Registry = openerp.base.Class.extend( /** @lends openerp.base.Regis } }); -/** - * OpenERP session aware controller - * a controller takes an already existing dom element and manage it - */ -openerp.base.Controller = openerp.base.Controller.extend( /** @lends openerp.base.Controller# */{ - init: function(parent, element_id) { - this._super(parent, element_id); - if(this.controller_parent && this.controller_parent.session) { - this.session = this.controller_parent.session; - } - }, - /** - * Performs a JSON-RPC call - * - * @param {String} url endpoint url - * @param {Object} data RPC parameters - * @param {Function} success RPC call success callback - * @param {Function} error RPC call error callback - * @returns {jQuery.Deferred} deferred object for the RPC call - */ - rpc: function(url, data, success, error) { - return this.session.rpc(url, data, success, error); - }, - do_action: function(action, on_finished) { - return this.parent.do_action(action, on_finished); - } -}); - -/** - * OpenERP session aware widget - * A widget is a controller that doesnt take an element_id - * it render its own html render() that you should insert into the dom - * and bind it at start() - */ -openerp.base.BaseWidget = openerp.base.Controller.extend({ - /** - * The name of the QWeb template that will be used for rendering. Must be - * redefined in subclasses or the render() method can not be used. - * - * @type string - */ - template: null, - /** - * The prefix used to generate an id automatically. Should be redefined in - * subclasses. If it is not defined, a default identifier will be used. - * - * @type string - */ - identifier_prefix: 'generic-identifier', - /** - * Base class for widgets. Handle rendering (based on a QWeb template), - * identifier generation, parenting and destruction of the widget. - * Also initialize the identifier. - * - * @constructs - * @params {openerp.base.search.BaseWidget} parent The parent widget. - */ - init: function (parent) { - this._super(parent); - this.make_id(this.identifier_prefix); - }, - /** - * Sets and returns a globally unique identifier for the widget. - * - * If a prefix is appended, the identifier will be appended to it. - * - * @params sections prefix sections, empty/falsy sections will be removed - */ - make_id: function () { - this.element_id = _.uniqueId(_.toArray(arguments).join('_')); - return this.element_id; - }, - /** - * Render the widget. This.template must be defined. - * The content of the current object is passed as context to the template. - * - * @param {object} additional Additional context arguments to pass to the template. - */ - render: function (additional) { - return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {})); - }, - /** - * "Starts" the widgets. Called at the end of the rendering, this allows - * to get a jQuery object referring to the DOM ($element attribute). - */ - start: function () { - this._super(); - var tmp = document.getElementById(this.element_id); - this.$element = tmp ? $(tmp) : null; - }, - /** - * "Stops" the widgets. Called when the view destroys itself, this - * lets the widgets clean up after themselves. - */ - stop: function () { - if(this.$element != null) { - this.$element.remove(); - } - this._super(); - } -}); openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.Session# */{ /** diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js index c9ca3193e70..1a13ab18607 100644 --- a/addons/base/static/src/js/controller.js +++ b/addons/base/static/src/js/controller.js @@ -145,6 +145,10 @@ instance.base.generate_null_object_class = function(claz, add) { return tmpclass.extend(add || {}); }; +// -------------------------------------------------------- +// OLD +// -------------------------------------------------------- + /** * OpenERP Controller * TODO merge BaseWidget with Controller @@ -243,6 +247,303 @@ instance.base.Controller = instance.base.Class.extend( /** @lends instance.base. } }); +/** + * OpenERP session aware controller + * a controller takes an already existing dom element and manage it + */ +instance.base.Controller = instance.base.Controller.extend( /** @lends openerp.base.Controller# */{ + init: function(parent, element_id) { + this._super(parent, element_id); + if(this.controller_parent && this.controller_parent.session) { + this.session = this.controller_parent.session; + } + }, + /** + * Performs a JSON-RPC call + * + * @param {String} url endpoint url + * @param {Object} data RPC parameters + * @param {Function} success RPC call success callback + * @param {Function} error RPC call error callback + * @returns {jQuery.Deferred} deferred object for the RPC call + */ + rpc: function(url, data, success, error) { + return this.session.rpc(url, data, success, error); + }, + do_action: function(action, on_finished) { + return this.parent.do_action(action, on_finished); + } +}); + +/** + * OpenERP session aware widget + * A widget is a controller that doesnt take an element_id + * it render its own html render() that you should insert into the dom + * and bind it at start() + */ +instance.base.BaseWidget = instance.base.Controller.extend({ + /** + * The name of the QWeb template that will be used for rendering. Must be + * redefined in subclasses or the render() method can not be used. + * + * @type string + */ + template: null, + /** + * The prefix used to generate an id automatically. Should be redefined in + * subclasses. If it is not defined, a default identifier will be used. + * + * @type string + */ + identifier_prefix: 'generic-identifier', + /** + * Base class for widgets. Handle rendering (based on a QWeb template), + * identifier generation, parenting and destruction of the widget. + * Also initialize the identifier. + * + * @constructs + * @params {openerp.base.search.BaseWidget} parent The parent widget. + */ + init: function (parent) { + this._super(parent); + this.make_id(this.identifier_prefix); + }, + /** + * Sets and returns a globally unique identifier for the widget. + * + * If a prefix is appended, the identifier will be appended to it. + * + * @params sections prefix sections, empty/falsy sections will be removed + */ + make_id: function () { + this.element_id = _.uniqueId(_.toArray(arguments).join('_')); + return this.element_id; + }, + /** + * Render the widget. This.template must be defined. + * The content of the current object is passed as context to the template. + * + * @param {object} additional Additional context arguments to pass to the template. + */ + render: function (additional) { + return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {})); + }, + /** + * "Starts" the widgets. Called at the end of the rendering, this allows + * to get a jQuery object referring to the DOM ($element attribute). + */ + start: function () { + this._super(); + var tmp = document.getElementById(this.element_id); + this.$element = tmp ? $(tmp) : null; + }, + /** + * "Stops" the widgets. Called when the view destroys itself, this + * lets the widgets clean up after themselves. + */ + stop: function () { + if(this.$element != null) { + this.$element.remove(); + } + this._super(); + } +}); + +// -------------------------------------------------------- +// N-style aka New-Style or Niv-Style +// -------------------------------------------------------- + +instance.base.NivController = instance.base.Class.extend({ + init: function(parent) { + this.controller_parent = parent; + // Take the session of the parent if defined + if(this.controller_parent && this.controller_parent.session) { + this.session = this.controller_parent.session; + } + // Transform on_* method into openerp.base.callbacks + for (var name in this) { + if(typeof(this[name]) == "function") { + this[name].debug_name = name; + // bind ALL function to this not only on_and _do ? + if((/^on_|^do_/).test(name)) { + this[name] = instance.base.callback(this, this[name]); + } + } + } + }, + /** + * Event binding, rpc and callback calling required to initialize the + * object should happen here + * + * Returns a promise object letting callers (subclasses and direct callers) + * know when this component is done starting + * + * @returns {jQuery.Deferred} + */ + start: function() { + // returns an already fulfilled promise. Maybe we could return nothing? + // $.when can take non-deferred and in that case it simply considers + // them all as fulfilled promises. + // But in thise case we *have* to ensure callers use $.when and don't + // try to call deferred methods on this return value. + return $.Deferred().done().promise(); + }, + stop: function() { + }, + log: function() { + var args = Array.prototype.slice.call(arguments); + var caller = arguments.callee.caller; + // TODO add support for line number using + // https://github.com/emwendelin/javascript-stacktrace/blob/master/stacktrace.js + // args.unshift("" + caller.debug_name); + this.on_log.apply(this,args); + }, + on_log: function() { + if(window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) { + var notify = false; + var body = false; + if(window.console) { + console.log(arguments); + } else { + body = true; + } + var a = Array.prototype.slice.call(arguments, 0); + for(var i = 0; i < a.length; i++) { + var v = a[i]==null ? "null" : a[i].toString(); + if(i==0) { + notify = v.match(/^not/); + body = v.match(/^bod/); + } + if(body) { + $('
      ').text(v).appendTo($('body'));
+                }
+                if(notify && this.notification) {
+                    this.notification.notify("Logging:",v);
+                }
+            }
+        }
+
+    },
+    /**
+     * Performs a JSON-RPC call
+     *
+     * @param {String} url endpoint url
+     * @param {Object} data RPC parameters
+     * @param {Function} success RPC call success callback
+     * @param {Function} error RPC call error callback
+     * @returns {jQuery.Deferred} deferred object for the RPC call
+     */
+    rpc: function(url, data, success, error) {
+        return this.session.rpc(url, data, success, error);
+    },
+    do_action: function(action, on_finished) {
+        return this.controller_parent.do_action(action, on_finished);
+    }
+});
+
+instance.base.NivWidget = instance.base.Controller.extend({
+    /**
+     * The name of the QWeb template that will be used for rendering. Must be
+     * redefined in subclasses or the render() method can not be used.
+     * 
+     * @type string
+     */
+    template: null,
+    /**
+     * The prefix used to generate an id automatically. Should be redefined in
+     * subclasses. If it is not defined, a default identifier will be used.
+     * 
+     * @type string
+     */
+    identifier_prefix: 'generic-identifier',
+    /**
+     * Base class for widgets. Handle rendering (based on a QWeb template),
+     * identifier generation, parenting and destruction of the widget.
+     * Also initialize the identifier.
+     *
+     * @constructs
+     * @params {openerp.base.search.BaseWidget} parent The parent widget.
+     */
+    init: function(parent, element_id) {
+        this._super(parent);
+        this.make_id(this.identifier_prefix);
+        // this.element_id = element_id;
+        // this.$element = $('#' + element_id);
+        // if (element_id) {
+        //     instance.screen[element_id] = this;
+        // }
+        // save the parent children relationship
+        this.controller_children = [];
+        if(parent && parent.controller_children) {
+            parent.controller_children.push(this);
+        }
+        // backward compatibility
+        this.parent = this.controller_parent;
+        this.children = this.controller_children;
+
+    },
+    /**
+     * Event binding, rpc and callback calling required to initialize the
+     * object should happen here
+     *
+     * Returns a promise object letting callers (subclasses and direct callers)
+     * know when this component is done starting
+     *
+     * @returns {jQuery.Deferred}
+     */
+    /**
+     * "Starts" the widgets. Called at the end of the rendering, this allows
+     * to get a jQuery object referring to the DOM ($element attribute).
+     */
+    start: function () {
+        this._super();
+        var tmp = document.getElementById(this.element_id);
+        this.$element = tmp ? $(tmp) : null;
+    },
+    stop: function() {
+        if(this.$element != null) {
+            this.$element.remove();
+        }
+        if (this.parent && this.parent.children) {
+            this.parent.children = _.without(this.parent.children, this);
+            this.parent.controller_children = this.parent.children;
+        }
+        this.parent = null;
+        this.controller_parent = null;
+    },
+    /**
+     * Sets and returns a globally unique identifier for the widget.
+     *
+     * If a prefix is appended, the identifier will be appended to it.
+     *
+     * @params sections prefix sections, empty/falsy sections will be removed
+     */
+    make_id: function () {
+        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        return this.element_id;
+    },
+    /**
+     * Render the widget. This.template must be defined.
+     * The content of the current object is passed as context to the template.
+     * 
+     * @param {object} additional Additional context arguments to pass to the template.
+     */
+    render: function (additional) {
+        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
+    },
+    widget_add: function(element, addfunc) {
+    },
+    widget_append: function(element) {
+    },
+    widget_prepend: function(element) {
+    },
+    widget_append2: function(element) {
+    },
+    widget_prepend2: function(element) {
+    },
+});
+
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From fbbebc5273ab1020ff85a3ee6f16ad63944b1406 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 28 Jul 2011 04:34:01 +0000
Subject: [PATCH 111/167] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110723045807-atb279zld82svwwl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110724043505-eqkwgue3w4cp3055
bzr revid: launchpad_translations_on_behalf_of_openerp-20110728043401-16vnngx2gj77oeom
---
 addons/account/i18n/fr.po             |  60 +++-
 addons/audittrail/i18n/fi.po          | 382 ++++++++++++++++++++
 addons/multi_company/i18n/vi.po       |  93 +++++
 addons/point_of_sale/i18n/ar.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/bg.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/bs.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/ca.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/cs.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/da.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/de.po       | 388 +++++++++++++-------
 addons/point_of_sale/i18n/el.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/es.po       | 382 +++++++++++++-------
 addons/point_of_sale/i18n/es_AR.po    | 377 +++++++++++++-------
 addons/point_of_sale/i18n/es_EC.po    | 382 +++++++++++++-------
 addons/point_of_sale/i18n/et.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/fi.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/fr.po       | 382 +++++++++++++-------
 addons/point_of_sale/i18n/hi.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/hr.po       | 379 +++++++++++++-------
 addons/point_of_sale/i18n/hu.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/id.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/it.po       | 467 +++++++++++++++---------
 addons/point_of_sale/i18n/ko.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/lt.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/mn.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/nl.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/nl_BE.po    | 377 +++++++++++++-------
 addons/point_of_sale/i18n/pl.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/pt.po       | 384 +++++++++++++-------
 addons/point_of_sale/i18n/pt_BR.po    | 384 +++++++++++++-------
 addons/point_of_sale/i18n/ro.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/ru.po       | 493 +++++++++++++++----------
 addons/point_of_sale/i18n/sl.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/sq.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/sr.po       | 382 +++++++++++++-------
 addons/point_of_sale/i18n/sr@latin.po | 384 +++++++++++++-------
 addons/point_of_sale/i18n/sv.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/tlh.po      | 377 +++++++++++++-------
 addons/point_of_sale/i18n/tr.po       |  60 ++--
 addons/point_of_sale/i18n/uk.po       | 377 +++++++++++++-------
 addons/point_of_sale/i18n/vi.po       | 379 +++++++++++++-------
 addons/point_of_sale/i18n/zh_CN.po    |  99 +++---
 addons/point_of_sale/i18n/zh_HK.po    | 377 +++++++++++++-------
 addons/point_of_sale/i18n/zh_TW.po    | 377 +++++++++++++-------
 addons/project/i18n/fr.po             |  47 ++-
 addons/purchase/i18n/ar.po            |  14 +-
 addons/purchase/i18n/bg.po            |  19 +-
 addons/purchase/i18n/bs.po            |  19 +-
 addons/purchase/i18n/ca.po            |  24 +-
 addons/purchase/i18n/cs.po            |  75 ++--
 addons/purchase/i18n/de.po            |  32 +-
 addons/purchase/i18n/el.po            |  19 +-
 addons/purchase/i18n/en_GB.po         |  14 +-
 addons/purchase/i18n/es.po            |  24 +-
 addons/purchase/i18n/es_AR.po         |  19 +-
 addons/purchase/i18n/es_CL.po         |  24 +-
 addons/purchase/i18n/es_EC.po         |  19 +-
 addons/purchase/i18n/et.po            |  19 +-
 addons/purchase/i18n/fi.po            | 128 ++++---
 addons/purchase/i18n/fr.po            |  24 +-
 addons/purchase/i18n/gl.po            |  14 +-
 addons/purchase/i18n/hr.po            |  14 +-
 addons/purchase/i18n/hu.po            |  24 +-
 addons/purchase/i18n/id.po            |  24 +-
 addons/purchase/i18n/it.po            |  24 +-
 addons/purchase/i18n/ko.po            |  19 +-
 addons/purchase/i18n/lt.po            |  19 +-
 addons/purchase/i18n/mn.po            |  24 +-
 addons/purchase/i18n/nb.po            |  19 +-
 addons/purchase/i18n/nl.po            |  24 +-
 addons/purchase/i18n/nl_BE.po         |  14 +-
 addons/purchase/i18n/pl.po            |  24 +-
 addons/purchase/i18n/pt.po            |  24 +-
 addons/purchase/i18n/pt_BR.po         |  24 +-
 addons/purchase/i18n/ro.po            |  24 +-
 addons/purchase/i18n/ru.po            |  32 +-
 addons/purchase/i18n/sk.po            |  14 +-
 addons/purchase/i18n/sl.po            |  14 +-
 addons/purchase/i18n/sq.po            |  14 +-
 addons/purchase/i18n/sr.po            |  19 +-
 addons/purchase/i18n/sr@latin.po      |  19 +-
 addons/purchase/i18n/sv.po            |  19 +-
 addons/purchase/i18n/th.po            | 183 ++++++----
 addons/purchase/i18n/tlh.po           |  14 +-
 addons/purchase/i18n/tr.po            | 495 ++++++++++++++++----------
 addons/purchase/i18n/uk.po            |  14 +-
 addons/purchase/i18n/vi.po            |  16 +-
 addons/purchase/i18n/zh_CN.po         | 370 ++++++++++---------
 addons/purchase/i18n/zh_TW.po         |  16 +-
 89 files changed, 11979 insertions(+), 5754 deletions(-)
 create mode 100644 addons/audittrail/i18n/fi.po
 create mode 100644 addons/multi_company/i18n/vi.po

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index f02c265fb8c..c753f7a992d 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-17 07:59+0000\n"
-"Last-Translator: Frederic Clementi - Camptocamp.com \n"
+"PO-Revision-Date: 2011-07-23 19:29+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \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: 2011-05-18 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: account
 #: code:addons/account/account.py:1305
@@ -367,7 +367,7 @@ msgstr "Solde théorique"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Entrée récurrente"
+msgstr "Écritures récurrentes manuelles"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -971,6 +971,7 @@ msgstr "Créer des périodes trimestrielles"
 
 #. module: account
 #: report:account.overdue:0
+#: report:account.aged_trial_balance:0
 msgid "Due"
 msgstr "Due"
 
@@ -1065,6 +1066,10 @@ msgstr "Modèle d'écritures"
 #: field:account.journal,code:0
 #: report:account.partner.balance:0
 #: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Code"
 msgstr "Code"
 
@@ -1392,6 +1397,7 @@ msgstr "Analyse des écritures comptables"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
 msgid "Partners"
 msgstr "Partenaires"
 
@@ -2284,6 +2290,11 @@ msgstr "Modèle de produit"
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Fiscal Year"
 msgstr "Exercice fiscal"
 
@@ -3033,7 +3044,7 @@ msgstr "Vue"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"
 
 #. module: account
 #: code:addons/account/account.py:2950
@@ -4755,7 +4766,7 @@ msgstr "Comptes de taxe enfant"
 #: code:addons/account/account.py:954
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr "La date de début de la période doit être avant la date de fin"
+msgstr "La période de début doit précéder la période de fin"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4795,6 +4806,11 @@ msgstr "Balance Analytique -"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Target Moves"
 msgstr "Mouvements Cibles"
 
@@ -4911,6 +4927,8 @@ msgstr "Résultat du lettrage"
 #: view:account.bs.report:0
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
 msgid "Balance Sheet"
 msgstr "Bilan"
 
@@ -6685,6 +6703,8 @@ msgstr "Plan de taxes comptables"
 #: report:account.general.journal:0
 #: report:account.invoice:0
 #: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Total:"
 msgstr "Total :"
 
@@ -8008,6 +8028,11 @@ msgstr "Devise société"
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Chart of Account"
 msgstr "Plan comptable"
 
@@ -8129,6 +8154,10 @@ msgstr "Journal d'avoirs"
 #: report:account.general.journal:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Filter By"
 msgstr "Filtré par"
 
@@ -8716,6 +8745,7 @@ msgstr "Impossible de trouver le code parent pour le compte modèle !"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direction d'Analyse"
 
@@ -8842,6 +8872,10 @@ msgstr "Laisser vide pour utiliser le compte de revenu"
 #: report:account.third_party_ledger_other:0
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Balance"
 msgstr "Solde de la balance"
 
@@ -8853,6 +8887,10 @@ msgstr "Saisi manuellement ou automatiquement dans le système"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Display Account"
 msgstr "Afficher le compte"
 
@@ -9168,6 +9206,7 @@ msgstr "Écriture d'abonnement"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
 msgid "Start Date"
 msgstr "Date de début"
 
@@ -9669,6 +9708,7 @@ msgstr "États"
 #: field:report.account.sales,amount_total:0
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
 msgid "Total"
 msgstr "Total"
 
@@ -9937,7 +9977,7 @@ msgstr ""
 #: selection:account.pl.report,display_account:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr "avec mouvements"
+msgstr "Avec mouvements"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -10188,6 +10228,7 @@ msgstr "account.addtmpl.wizard"
 #: field:account.partner.ledger,result_selection:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
 msgid "Partner's"
 msgstr "Du partenaire"
 
@@ -12159,3 +12200,6 @@ msgstr ""
 #~ "Une facture de remboursement est un document qui annule une facture ou une "
 #~ "partie de celle-ci. Vous pouvez facilement générer des remboursements et les "
 #~ "réconcilier à partir de la vue formulaire de factures."
+
+#~ msgid "Balance:"
+#~ msgstr "Solde de la balance:"
diff --git a/addons/audittrail/i18n/fi.po b/addons/audittrail/i18n/fi.po
new file mode 100644
index 00000000000..6d8e1952636
--- /dev/null
+++ b/addons/audittrail/i18n/fi.po
@@ -0,0 +1,382 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-07-27 10:38+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-28 04:33+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+
+#. module: audittrail
+#: model:ir.module.module,shortdesc:audittrail.module_meta_information
+msgid "Audit Trail"
+msgstr "Seuranta"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:81
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Loki"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Subscribed"
+msgstr "Tilatut"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "Audittrail Rule"
+msgstr "Seurantasääntö"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
+msgid "Audit Logs"
+msgstr "Auditointilokit"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: view:audittrail.rule:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: field:audittrail.rule,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: audittrail
+#: view:audittrail.rule:0
+#: selection:audittrail.rule,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value:0
+msgid "Old Value"
+msgstr "Aikaisempi arvo"
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
+msgid "View log"
+msgstr "Katso lokia"
+
+#. module: audittrail
+#: help:audittrail.rule,log_read:0
+msgid ""
+"Select this if you want to keep track of read/open on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,method:0
+msgid "Method"
+msgstr "Metodi"
+
+#. module: audittrail
+#: field:audittrail.view.log,from:0
+msgid "Log From"
+msgstr "Loki alkaen"
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr "Login ID"
+
+#. module: audittrail
+#: field:audittrail.log,res_id:0
+msgid "Resource Id"
+msgstr "Resurssi ID"
+
+#. module: audittrail
+#: help:audittrail.rule,user_id:0
+msgid "if  User is not added then it will applicable for all users"
+msgstr "Jos käyttäjää ei lisätä, koskee kaikkia käyttäjiä"
+
+#. module: audittrail
+#: help:audittrail.rule,log_workflow:0
+msgid ""
+"Select this if you want to keep track of workflow on any record of the "
+"object of this rule"
+msgstr ""
+"Valitse tämä jos haluat seurata työnkulua millä tahansa tietueella jota tämä "
+"sääntö koskee"
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Käyttäjät"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Log Lines"
+msgstr "Lokirivit"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,object_id:0
+#: field:audittrail.rule,object_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rule"
+msgstr "Seurantasääntö"
+
+#. module: audittrail
+#: field:audittrail.view.log,to:0
+msgid "Log To"
+msgstr "Loki kohteeseen"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value Text: "
+msgstr "Uuden arvon teksti: "
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Search Audittrail Rule"
+msgstr "Hae seurantasääntöä"
+
+#. module: audittrail
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
+msgid "Audit Rules"
+msgstr "Seurantasäännöt"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr "Aikaisempi arvo: "
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Resource Name"
+msgstr "Resurssn nimi"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,timestamp:0
+msgid "Date"
+msgstr "Päivämäärä"
+
+#. module: audittrail
+#: help:audittrail.rule,log_write:0
+msgid ""
+"Select this if you want to keep track of modification on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
+msgstr "Lokien luonnit"
+
+#. module: audittrail
+#: help:audittrail.rule,object_id:0
+msgid "Select object for which you want to generate log."
+msgstr "Valitse objekti jolle haluat luoda lokin"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value Text : "
+msgstr "Aikaisempi arvo tekstinä : "
+
+#. module: audittrail
+#: field:audittrail.rule,log_workflow:0
+msgid "Log Workflow"
+msgstr "Kirjaa työnkulku"
+
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid ""
+"\n"
+"    This module gives the administrator the rights\n"
+"    to track every user operation on all the objects\n"
+"    of the system.\n"
+"\n"
+"    Administrator can subscribe rules for read,write and\n"
+"    delete on objects and can check logs.\n"
+"    "
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_read:0
+msgid "Log Reads"
+msgstr "Lokin lukemiset"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:82
+#, python-format
+msgid "Change audittrail depends -- Setting rule as DRAFT"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,line_ids:0
+msgid "Log lines"
+msgstr "Lokirivit"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_id:0
+msgid "Fields"
+msgstr "Kentät"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "AuditTrail Rules"
+msgstr "Seurantasäännöt"
+
+#. module: audittrail
+#: help:audittrail.rule,log_unlink:0
+msgid ""
+"Select this if you want to keep track of deletion on any record of the "
+"object of this rule"
+msgstr ""
+"Valitse tämä jos haluat seurata kaikkia poistotapahtumia joita tämä objektin "
+"sääntö koskee"
+
+#. module: audittrail
+#: view:audittrail.log:0
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#. module: audittrail
+#: field:audittrail.rule,action_id:0
+msgid "Action ID"
+msgstr "Toiminnon tunnus"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Users (if User is not added then it will applicable for all users)"
+msgstr "Käyttäjtä (jos ei lisätty, koskee kaikkia käyttäjiä)"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "UnSubscribe"
+msgstr "Peruuta tilaus"
+
+#. module: audittrail
+#: field:audittrail.rule,log_unlink:0
+msgid "Log Deletes"
+msgstr "Loki poistot"
+
+#. module: audittrail
+#: field:audittrail.log.line,field_description:0
+msgid "Field Description"
+msgstr "Kentän kuvaus"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Search Audittrail Log"
+msgstr "Hae seurantalokeista"
+
+#. module: audittrail
+#: field:audittrail.rule,log_write:0
+msgid "Log Writes"
+msgstr "Lokin kirjoitukset"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Open Logs"
+msgstr "Avaa lokit"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value_text:0
+msgid "New value Text"
+msgstr "Uuden arvon teksti"
+
+#. module: audittrail
+#: field:audittrail.rule,name:0
+msgid "Rule Name"
+msgstr "Säännön nimi"
+
+#. module: audittrail
+#: field:audittrail.log.line,new_value:0
+msgid "New Value"
+msgstr "Uusi arvo"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "AuditTrail Logs"
+msgstr "Seuranalokit"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "Audittrail Log"
+msgstr "Seurantaloki"
+
+#. module: audittrail
+#: help:audittrail.rule,log_action:0
+msgid ""
+"Select this if you want to keep track of actions on the object of this rule"
+msgstr ""
+"Valitse tämä jos haluat seurata toimintoja joihin tämä objekti liittyy"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "New Value : "
+msgstr "Uusi arvo : "
+
+#. module: audittrail
+#: sql_constraint:audittrail.rule:0
+msgid ""
+"There is a rule defined on this object\n"
+" You can not define other on the same!"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,old_value_text:0
+msgid "Old value Text"
+msgstr "Vanhan arvon teksti"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_view_log
+msgid "View Log"
+msgstr "Näytä loki"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "Log Line"
+msgstr "Lokirivi"
+
+#. module: audittrail
+#: field:audittrail.rule,log_action:0
+msgid "Log Action"
+msgstr "Lokitoiminto"
+
+#. module: audittrail
+#: help:audittrail.rule,log_create:0
+msgid ""
+"Select this if you want to keep track of creation on any record of the "
+"object of this rule"
+msgstr ""
diff --git a/addons/multi_company/i18n/vi.po b/addons/multi_company/i18n/vi.po
new file mode 100644
index 00000000000..38db07dd390
--- /dev/null
+++ b/addons/multi_company/i18n/vi.po
@@ -0,0 +1,93 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-07-23 16:31+0000\n"
+"Last-Translator: Phong Nguyen-Thanh \n"
+"Language-Team: Vietnamese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:35+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Điều kiện"
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"\n"
+"    Multicompany module is for managing a multicompany environment.\n"
+"    This module is the base module for other multicompany modules.\n"
+"    "
+msgstr ""
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index b51c591718e..877d9a3f010 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index 1b96cb6a671..e813d277ec6 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Прилагане на отстъпка"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Днес"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Добави продукт"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Детайли за продажбите"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Сканиране на продукт"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Ден"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Добави плащане:"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Продажби за деня по текущ потребител"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Сума"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "ДДС"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Произход"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Данък"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Всички нареждания са в състояние на изчакване до приеманете им"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Контрагент"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Общо за деня"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Средна цена"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Отстъка (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Общо отстъпка"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Състояние"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Управление на касови апарати"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Не е намерена валидна ценова листа !"
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr "месечни продажби по потребител"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Дата на плащане"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr "За броене"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Обобщена информация"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr "Отложено плащане"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Количество"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr "Точка"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Общо нето:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr "Отпечатване на отчет"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Единична цена"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr "Сума по фактура"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Журнал"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Тел. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Плащане"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr "Общо продажби (Приходи)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Пълно плащане"
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr "Провери детайли"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Кол. продукт"
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Междинна сума"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Общо продажби"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Сбор междинни суми"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Дата на плащане"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Общо :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Невъзможно създаване на ред !"
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr "Име на продукт"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Невалидно действие !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Ценоразпис"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Общо фактурано"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Проект на фактура"
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "ДДС :"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "неизвестен"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Дата"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Отмяна"
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr "Име"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Друг"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr "Потребители"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Цена"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Баркод"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Името на дневникът трябва да бъде уникално за всяко предприятие!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Няма ценова листа !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr "Дата на поръка"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Основен"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Бележки"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Поръчка за продажба"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Данъци"
@@ -1103,12 +1139,13 @@ msgstr "Данъци"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Код"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr "Допълнителна информация"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Факс:"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr "Списък за товарене"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "К-во"
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Грешка !"
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr "Начален баланс"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Платен"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr "Запитване"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Общо:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr "Създаване на фактура"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Завършен"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Фактура"
 
@@ -1425,7 +1482,6 @@ msgstr "Отваряне"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Отпратка към поръчка"
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Данъци:"
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr "Начална дата"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Общо"
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr "Редове от връщане"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Фирма"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Дата на фактура"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr "Грешка!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Дата на валидност"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Магазин"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr "Отменена фактура"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Потвърди"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Фактура към доставчик"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Невъзможна промяната на ред!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Настройка"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr "Съобщение"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Център продажби"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Търговец"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Фактурирано"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Добави"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Проект"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Моля, изберете партньор за тази продажба."
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Моля, създайте фактура за тази продажба."
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index feca51685c8..9ed2903f1ac 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index e67ad396923..1c5eb9e2f23 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplica descompte"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Afegeix producte :"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalls de vendes"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Escanneja producte"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Afegeix pagament :"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Import"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "IVA"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Impost"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total del dia"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Desc. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total descompte"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estat"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "S'ha trobat una línia de tarifa no vàlida!"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Data pagament"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Resum"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantitat"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Total net:"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Preu unitat"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Diari"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pagament"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Mode d'impostos"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pagat"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Qtat. producte"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total vendes"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "Suma de subtotals"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Data de pagament"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "TPV "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Ha fallat la creació de línia!"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Acció no vàlida!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Tarifa"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total facturat"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factura esborrany"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "CIF/NIF:"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconegut"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Data"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "No podeu modificar aquesta venda. Ja ha estat pagada."
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Número de transacció"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Varis"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Preu"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Codi de barres"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Punt de venda"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Factura d'abonament de proveïdor"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "No existeix tarifa!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Seleccioneu una comanda de venda oberta"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notes"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Comanda de venda"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impostos"
@@ -1104,12 +1140,13 @@ msgstr "Impostos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Línia de venda"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Codi"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Qtat"
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Error!"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No s'han afegit línies en aquesta venda."
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pagat"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Tiquet"
 
@@ -1401,15 +1458,15 @@ msgstr "Crea factura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Realitzat"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. venda"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Impostos:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Producte"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Companyia"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Data factura"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Núm. d'articles"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Data validació"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Albarà"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Tenda"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Últim albarà de sortida"
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Escanneja codi de barres"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Factura de proveïdor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Ha fallat la modificació de la línia!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Descripció pagament"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuració"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Terminal Punt de Venda"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Dependent"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturat"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Afegeix"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Si us plau, indiqueu una empresa per la venda."
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Usuari"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Vendes per usuari"
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Devolució"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Creeu una factura per aquesta venda."
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Tanca"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descripció"
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Pagaments"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Data impressió"
 
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index 6572c211ff4..e8f4f21e3d5 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Přidat produkt :"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Mezisoučet"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Báze"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Poznámky"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Společnost"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Konfigurace"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 5d826a9ce85..34ee3cb04d5 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1104,12 +1140,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1401,15 +1458,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 4d29f3ae7bb..c72109f8bcc 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-03-07 18:12+0000\n"
-"Last-Translator: Steffi Frank (Bremskerl, DE) \n"
+"PO-Revision-Date: 2011-07-23 02:59+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) \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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Point of Sale"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Rabatt anwenden"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Heute"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Produkt hinzufügen:"
 
@@ -79,6 +80,8 @@ msgstr "Auswertungen Point of Sale"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Verkauf Details"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Sind Sie sicher, dass Sie die Kassenkontoauszüge beenden wollen?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Scanne Produkt"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Tag"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Erfasse Zahlung:"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Heutige Verkäufe des derzeitigen Benutzers"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Betrag"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "USt."
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Referenz"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Steuern"
 
@@ -157,13 +164,14 @@ msgstr ""
 "Alle Aufträge verbleiben im Status 'Unerledigt' bevor diese bestätigt werden."
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Tagessumme"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr "Durchschnittspreis"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Rabatt (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Gesamt Rabatt"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Status"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr "Barkassen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Keine gültige Preisliste gefunden"
@@ -364,7 +379,8 @@ msgid "Sales by User Monthly"
 msgstr "Verkäufe nach Benutzer je Monat"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Datum Zahlung"
 
@@ -386,8 +402,8 @@ msgid "To count"
 msgstr "Berechnen"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -402,10 +418,12 @@ msgid "Delay Payment"
 msgstr "Zeit bis Zahlung"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Menge"
 
@@ -421,7 +439,8 @@ msgid "Period"
 msgstr "Periode"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Summe Netto:"
 
@@ -453,9 +472,12 @@ msgid "Print Report"
 msgstr "Drucke Report"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Preis pro Einheit"
 
@@ -481,22 +503,28 @@ msgid "Invoice Amount"
 msgstr "Rechnungsbetrag"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Journal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel.:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Zahlung"
 
@@ -527,8 +555,8 @@ msgstr ""
 "bestätigte Kassenbücher aufweist."
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Steuermodus"
 
@@ -561,8 +589,8 @@ msgid "Sales total(Revenue)"
 msgstr "Gesamtumsatz"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Summe bezahlt"
 
@@ -572,10 +600,10 @@ msgid "Check Details"
 msgstr "Prüfe Details"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr "Anz."
+msgstr "Produktmenge"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
@@ -604,7 +632,8 @@ msgid ""
 msgstr "Sie müssen noch eine Preisliste beim Verkaufsauftrag wählen !"
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Zwischensumme"
 
@@ -661,18 +690,17 @@ msgid "St.Name"
 msgstr "Bezeichn."
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Gesamtsumme Verkauf"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Sum of subtotals"
-msgstr "Summierung Zwischensummen"
+msgstr "Zwischensummen"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Zahlungsdatum"
 
@@ -692,6 +720,10 @@ msgid "Today's Sales"
 msgstr "Heutige Verkäufe"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -704,7 +736,7 @@ msgid "Total :"
 msgstr "Summe :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Erzeuge Buchung gescheitert !"
@@ -716,19 +748,20 @@ msgid "Product Name"
 msgstr "Produktbezeichnung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Fehlerhafte Aktion !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Preisliste"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Summe berechnet"
 
@@ -763,7 +796,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Heutige Kassenabschlüsse"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Entwurf Rechnung"
 
@@ -815,7 +848,7 @@ msgid "Disc."
 msgstr "Rabatt (%)"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "USt.:"
 
@@ -830,13 +863,13 @@ msgid "Receipt :"
 msgstr "Quittung :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "unbekannt"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Datum"
@@ -873,7 +906,7 @@ msgid "Pos Box Entries"
 msgstr "Kassenbuchungen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Sie können diesen Auftrag nicht ändern, er ist bereits bezahlt."
@@ -895,15 +928,14 @@ msgid "Number of Transaction"
 msgstr "Transaktionsnummer"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -949,7 +981,7 @@ msgid "First Name"
 msgstr "Vorname"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Andere"
 
@@ -977,19 +1009,22 @@ msgid "Users"
 msgstr "Benutzer"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Preis"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Strichcode"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1039,7 +1074,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Die Journalbezeichnung sollte pro Unternehmen eindeutig sein."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Lieferanten Gutschrift"
 
@@ -1062,13 +1097,15 @@ msgid "All Closed CashBox"
 msgstr "Alle abgeschlossenen Kassen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Keine Preisliste!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Wähle offenen Verkaufsauftrag"
 
@@ -1078,7 +1115,7 @@ msgid "Order date"
 msgstr "Datum Auftrag"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Basis"
 
@@ -1094,18 +1131,17 @@ msgstr "Vertriebsleiter"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Bemerkung"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Verkaufsauftrag"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Steuern"
@@ -1113,12 +1149,13 @@ msgstr "Steuern"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Verkauf Positionen"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Kurzbez."
 
@@ -1151,7 +1188,7 @@ msgid "Extra Info"
 msgstr "Weitere Information"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax:"
 
@@ -1203,8 +1240,14 @@ msgid "Picking List"
 msgstr "Packliste"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Anz"
 
@@ -1222,8 +1265,15 @@ msgid "Sale by User"
 msgstr "Verkäufe nach Benutzer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Fehler!"
@@ -1351,7 +1401,7 @@ msgid "Customer Note"
 msgstr "Mitteilung Kunde"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Keine Auftragszeilen für diesen Verkauf definiert"
@@ -1362,7 +1412,10 @@ msgid "Opening Balance"
 msgstr "Startsaldo"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Bezahlt"
 
@@ -1378,7 +1431,11 @@ msgid "Quotation"
 msgstr "Alle externen Angebote"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Summe:"
 
@@ -1412,7 +1469,7 @@ msgid "Nbr Invoice"
 msgstr "Keine Rechnung"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Quittung"
 
@@ -1423,15 +1480,15 @@ msgstr "Erzeuge Rechnung"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Erledigt"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Rechnung"
 
@@ -1448,7 +1505,6 @@ msgstr "Offen"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Referenz Auftrag"
 
@@ -1482,7 +1538,7 @@ msgid "Sales by User Margin"
 msgstr "Verkaufsmargen nach Benutzer"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Steuern:"
 
@@ -1492,9 +1548,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Auswertungen POS Verkäufe"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
@@ -1578,8 +1642,13 @@ msgid "Date Start"
 msgstr "Startdatum"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Summe"
 
@@ -1623,12 +1692,26 @@ msgid "Return lines"
 msgstr "Ausgabe Einzelposten"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Firma"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Rechnungsdatum"
 
@@ -1680,29 +1763,28 @@ msgid "Error!"
 msgstr "Fehler!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Anz. der Artikel"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Datum Validierung"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Warenauswahl"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Shop"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Letzter Ausgangslieferschein"
 
@@ -1744,7 +1826,7 @@ msgid "Refunded Quantity"
 msgstr "Rückgabemenge"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Barcode Scannen"
 
@@ -1775,8 +1857,9 @@ msgid "Cancelled Invoice"
 msgstr "Abbruch Rechnung"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Bestätige"
 
@@ -1796,18 +1879,18 @@ msgid "Discount "
 msgstr "Rabatt "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Lieferantenrechnung"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Fehler bei Modifiziere Buchung !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Zahlungsbezeichnung"
 
@@ -1839,7 +1922,7 @@ msgstr ""
 "sein !"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -1902,23 +1985,32 @@ msgid "Message"
 msgstr "Nachricht"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Point of Sale"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Verkäufer"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Berechnet"
 
@@ -1935,12 +2027,13 @@ msgid "Discount Notice"
 msgstr "Rabatthinweis"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Hinzu"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
@@ -1960,12 +2053,12 @@ msgid "POS Payment Report according to date"
 msgstr "POS Auswertungen Barkasse nach Datum"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Bitte Partner für Verkauf definieren"
@@ -1984,14 +2077,26 @@ msgid "Cashier"
 msgstr "Kassierer"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Verkauf nach Benutzer"
 
@@ -2018,7 +2123,13 @@ msgid "POS Orders lines"
 msgstr "POS Kaufpositionen"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Fehler"
@@ -2029,12 +2140,12 @@ msgid "Sales Journal"
 msgstr "Verkauf Journal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Gutschrift"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "BItte Rechnung für diesen Verkauf erzeugen"
@@ -2059,7 +2170,16 @@ msgid "Disc(%)"
 msgstr "Rabatt(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Schließen"
 
@@ -2111,11 +2231,11 @@ msgid "please check that account is set to %s"
 msgstr "bitte prüfen Sie, daß das Konto auf %s gesetzt wird."
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -2211,12 +2331,21 @@ msgid "April"
 msgstr "April Mitteilungen"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Anzeige Zahlungen"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Druckdatum"
 
@@ -2529,6 +2658,9 @@ msgstr "Jahr"
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Fehler: Ungültige Steuernummer (falsche checksum)"
 
+#~ msgid "Product for expenses"
+#~ msgstr "Produkt für Ausgaben"
+
 #~ msgid "Bancontact Journal"
 #~ msgstr "Journal EC Cash Verfahren"
 
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 639edf9dd3a..f1e3786a5c1 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Εφαρμογή Έκπτωσης"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Προσθήκη προϊόντος :"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Λεπτομέρειες Πωλήσεων"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Ανάγνωση προϊόντος"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Προσθήκη πληρωμής:"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Ποσό"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "ΦΠΑ"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Φόρος"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Σύνολο της ημέρας"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Εκπτ. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Σύνολο έκπτωσης"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Κατάσταση"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Κανένας έγκυρος τιμοκατάλογος γραμμής δεν βρέθηκε!"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Ημερομηνία Πληρωμής"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Σύνολο"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Ποσότητα"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Καθαρό Σύνολο:"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Τιμή Μονάδας"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Τηλ:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Πληρωμή"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Κατάσταση Των Φόρων"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Πληρωμένο Σύνολο"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Ποσότητα Είδους"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Υποσύνολο"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Σύνολο πωλήσεων"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "Σύνολο των υποσυνόλων"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Ημερομηνία πληρωμής"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Ανεπιτυχής δημιουργία γραμμής!"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Άκυρη ενέργεια!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Τιμοκατάλογος"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Σύνολο τιμολογημένων"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Πρόχειρο Τιμολόγιο"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "ΦΠΑ :"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "άγνωστο"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Ημερομηνία"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -887,15 +920,14 @@ msgid "Number of Transaction"
 msgstr "Αριθμός Συναλλαγών"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Άκυρο"
 
@@ -941,7 +973,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Άλλο"
 
@@ -969,19 +1001,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Τιμή"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Γραμμογράφηση"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1031,7 +1066,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Επιστροφή χρημάτων Προμηθευτή"
 
@@ -1054,13 +1089,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Κανένας Τιμοκατάλογος !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Επιλέξτε μία ανοιχτή εντολή πώλησης"
 
@@ -1070,7 +1107,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Βάση"
 
@@ -1086,18 +1123,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Σημειώσεις"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Εντολή Πώλησης"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Φόροι"
@@ -1105,12 +1141,13 @@ msgstr "Φόροι"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Γραμμή Πώλησης"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Κωδικός"
 
@@ -1143,7 +1180,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1184,8 +1221,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Ποσ."
 
@@ -1203,8 +1246,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Σφάλμα !"
@@ -1332,7 +1382,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Καμία γραμμή εντολής δεν καθορίστηκε για αυτήν την πώληση"
@@ -1343,7 +1393,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Πληρωμένο"
 
@@ -1359,7 +1412,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Σύνολο:"
 
@@ -1391,7 +1448,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Απόδειξη"
 
@@ -1402,15 +1459,15 @@ msgstr "Δημιουργία Τιμολογίου"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Εκπληρωμένο"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Τιμολόγιο"
 
@@ -1427,7 +1484,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Σχετ Εντολή"
 
@@ -1461,7 +1517,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Φόροι:"
 
@@ -1471,9 +1527,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Προϊόν"
 
@@ -1554,8 +1618,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Σύνολο"
 
@@ -1599,12 +1668,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Εταιρία"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Ημερομηνία Τιμολόγησης"
 
@@ -1653,29 +1736,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Αριθμός Άρθρων"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Ημερομηνία Εγκυρότητας"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Συλλογή"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Κατάστημα"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Τελευταία Έξοδος Συλλογής"
 
@@ -1717,7 +1799,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Ανάγνωση Γραμμογράφησης"
 
@@ -1748,8 +1830,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
@@ -1769,18 +1852,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Τιμολόγιο Προμηθευτή"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Ανεπιτυχής τροποποίηση γραμμής!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Όνομα πληρωμής"
 
@@ -1810,7 +1893,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Ρύθμιση"
 
@@ -1873,23 +1956,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Σημείο Πώλησης"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Πωλητής"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Τιμολογημένο"
 
@@ -1906,12 +1998,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Προσθήκη"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Πρόχειρο"
 
@@ -1931,12 +2024,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "ΠΡΟ-ΦΟΡΜΑ"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Παρακαλώ καθορίστε έναν συνεργάτη για πώληση."
@@ -1954,14 +2047,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Χρήστης"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Πωλήσεις κατα χρήστη"
 
@@ -1988,7 +2093,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -1999,12 +2110,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Πίστωση"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Παρακαλώ δημιουργήστε ένα τιμολόγιο για αυτήν την πώληση."
@@ -2029,7 +2140,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -2081,11 +2201,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -2179,12 +2299,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Πληρωμές"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Ημερομηνία Εκτύπωσης"
 
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index de505a2b245..f63e239fe2e 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-03-24 19:00+0000\n"
+"PO-Revision-Date: 2011-07-23 03:02+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) \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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Punto de venta. Confirmar"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplicar descuento"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Hoy"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Añadir producto :"
 
@@ -79,6 +80,8 @@ msgstr "Análisis registro"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalles de ventas"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "¿Está seguro de querer cerrar las declaraciones?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Escanear producto"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Día"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Añadir pago :"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Ventas de hoy por usuario actual"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Importe"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "CIF/NIF"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Origen"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Pondrá todas las órdenes en espera hasta que sean aceptadas"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total del día"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Precio promedio"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Desc. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total descuento"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Gestión de la caja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "¡Se ha encontrado una línea de tarifa no válida!"
@@ -363,7 +378,8 @@ msgid "Sales by User Monthly"
 msgstr "Ventas mensuales por usuario"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Fecha de pago"
 
@@ -385,8 +401,8 @@ msgid "To count"
 msgstr "Para contar"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Resumen"
 
@@ -401,10 +417,12 @@ msgid "Delay Payment"
 msgstr "Retrasar pago"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Cantidad"
 
@@ -419,7 +437,8 @@ msgid "Period"
 msgstr "Período"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Base:"
 
@@ -451,9 +470,12 @@ msgid "Print Report"
 msgstr "Imprimir informe"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Precio unidad"
 
@@ -479,22 +501,28 @@ msgid "Invoice Amount"
 msgstr "Importe factura"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pago"
 
@@ -525,8 +553,8 @@ msgstr ""
 "registradoras confirmadas!"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Modo de impuestos"
 
@@ -559,8 +587,8 @@ msgid "Sales total(Revenue)"
 msgstr "Total ventas (ingresos)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pagado"
 
@@ -570,8 +598,8 @@ msgid "Check Details"
 msgstr "Verificar detalles"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Ctd. producto"
 
@@ -604,7 +632,8 @@ msgstr ""
 "Por favor seleccione una antes de seleccionar un producto."
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -661,8 +690,7 @@ msgid "St.Name"
 msgstr "Nombre extracto"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total ventas"
 
@@ -672,7 +700,7 @@ msgid "Sum of subtotals"
 msgstr "Suma de subtotales"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Fecha de pago"
 
@@ -692,6 +720,10 @@ msgid "Today's Sales"
 msgstr "Ventas de hoy"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "TPV "
@@ -704,7 +736,7 @@ msgid "Total :"
 msgstr "Total:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "¡Ha fallado la creación de línea!"
@@ -716,19 +748,20 @@ msgid "Product Name"
 msgstr "Nombre del Producto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Tarifa"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total facturado"
 
@@ -763,7 +796,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caja registradora cerrada hoy"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factura borrador"
 
@@ -815,7 +848,7 @@ msgid "Disc."
 msgstr "Desc."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "CIF/NIF:"
 
@@ -830,13 +863,13 @@ msgid "Receipt :"
 msgstr "Recibo"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconocido"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Fecha"
@@ -873,7 +906,7 @@ msgid "Pos Box Entries"
 msgstr "Entradas caja TPV"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "No puede modificar esta venta. Ya ha sido pagada."
@@ -895,15 +928,14 @@ msgid "Number of Transaction"
 msgstr "Número de transacción"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -949,7 +981,7 @@ msgid "First Name"
 msgstr "Nombre"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Varios"
 
@@ -977,19 +1009,22 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Precio"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Código de barras"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "TPV"
@@ -1039,7 +1074,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "¡El nombre del diaro debe ser único por compañía!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Devolución proveedor"
 
@@ -1062,13 +1097,15 @@ msgid "All Closed CashBox"
 msgstr "Todas cajas registradoras cerradas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No existe tarifa!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Seleccione una orden de venta abierta"
 
@@ -1078,7 +1115,7 @@ msgid "Order date"
 msgstr "Fecha pedido"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1094,18 +1131,17 @@ msgstr "Responsable de ventas"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Pedido de venta"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impuestos"
@@ -1113,12 +1149,13 @@ msgstr "Impuestos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Línea de venta"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Código"
 
@@ -1151,7 +1188,7 @@ msgid "Extra Info"
 msgstr "Información extra"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1203,8 +1240,14 @@ msgid "Picking List"
 msgstr "Albarán"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Ctd."
 
@@ -1222,8 +1265,15 @@ msgid "Sale by User"
 msgstr "Ventas por usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -1351,7 +1401,7 @@ msgid "Customer Note"
 msgstr "Nota cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No se han añadido líneas en esta venta."
@@ -1362,7 +1412,10 @@ msgid "Opening Balance"
 msgstr "Saldo de apertura"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pagado"
 
@@ -1378,7 +1431,11 @@ msgid "Quotation"
 msgstr "Presupuesto"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1412,7 +1469,7 @@ msgid "Nbr Invoice"
 msgstr "Nº factura"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Tiquet"
 
@@ -1423,15 +1480,15 @@ msgstr "Crear factura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Realizado"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1448,7 +1505,6 @@ msgstr "Abierto"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. venta"
 
@@ -1482,7 +1538,7 @@ msgid "Sales by User Margin"
 msgstr "Ventas por margen usuario"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Impuestos:"
 
@@ -1492,9 +1548,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Punto de venta. Estadísticas pedidos"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Producto"
 
@@ -1576,8 +1640,13 @@ msgid "Date Start"
 msgstr "Fecha inicial"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1621,12 +1690,26 @@ msgid "Return lines"
 msgstr "Líneas de devolución"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Fecha factura"
 
@@ -1678,29 +1761,28 @@ msgid "Error!"
 msgstr "¡Error!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Núm. de artículos"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Fecha validez"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Albarán"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Tienda"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Último albarán de salida"
 
@@ -1742,7 +1824,7 @@ msgid "Refunded Quantity"
 msgstr "Cantidad devuelta"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Escanear código de barras"
 
@@ -1773,8 +1855,9 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1794,18 +1877,18 @@ msgid "Discount "
 msgstr "Descuento "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "¡Ha fallado la modificación de la línea!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Descripción pago"
 
@@ -1835,7 +1918,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "¡El código del diario debe ser único por compañía!"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -1898,23 +1981,32 @@ msgid "Message"
 msgstr "Mensaje"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Terminal Punto de Venta"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendedor"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturado"
 
@@ -1931,12 +2023,13 @@ msgid "Discount Notice"
 msgstr "Nota de descuento"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Añadir"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Borrador"
 
@@ -1956,12 +2049,12 @@ msgid "POS Payment Report according to date"
 msgstr "TPV. Informe de pago según la fecha"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por favor indique una empresa para la venta."
@@ -1980,14 +2073,26 @@ msgid "Cashier"
 msgstr "Cajero"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Ventas por usuario"
 
@@ -2014,7 +2119,13 @@ msgid "POS Orders lines"
 msgstr "TPV Líneas pedido"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -2025,12 +2136,12 @@ msgid "Sales Journal"
 msgstr "Diario de ventas"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Devolución"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Por favor, cree una factura para esta venta."
@@ -2055,7 +2166,16 @@ msgid "Disc(%)"
 msgstr "Desc(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2107,11 +2227,11 @@ msgid "please check that account is set to %s"
 msgstr "Compruebe que la cuenta esté establecida a %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -2207,12 +2327,21 @@ msgid "April"
 msgstr "Abril"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Pagos"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Fecha impresión"
 
@@ -2497,5 +2626,8 @@ msgstr "Año"
 #~ msgid "You must assign a production lot for this product"
 #~ msgstr "Debe asignar un lote de producción para este producto"
 
+#~ msgid "Product for expenses"
+#~ msgstr "Producto para gastos"
+
 #~ msgid "Must be after setLang()"
 #~ msgstr "Debe estar después de setLang()"
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index ea0e6cd29aa..a853670cad9 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplicar descuento"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Añadir producto :"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalles de ventas"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Escanear producto"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Añadir pago :"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Cantidad"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "IVA"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total del día"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Desc. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total descuento"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "No valid pricelist line found !"
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Fecha de pago"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Resumen"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Cantidad"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Total neto:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Precio Unitario"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pago"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Modo de impuestos"
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pagado"
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Ctd. producto"
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total ventas"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Suma de subtotales"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Fecha de pago"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "PDV "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "¡Ha fallado la creación de línea!"
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de Precios"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total facturado"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factura borrador"
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "IVA :"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconocido"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Fecha"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "You can't modify this order. It has already been paid"
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr "Número de Transacción"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Otros"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Precio"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Código de Barras"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "PDV"
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Devolución proveedor"
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sin lista de precio !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Seleccione una orden de venta abierta"
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Orden de Venta"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impuestos"
@@ -1103,12 +1139,13 @@ msgstr "Impuestos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Línea de venta"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Código"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Ctd."
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No order lines defined for this sale."
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pagado"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Recibo"
 
@@ -1400,15 +1457,15 @@ msgstr "Crear factura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Finalizado"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. venta"
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Impuestos:"
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Producto"
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Fecha factura"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "No. de Artículo"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Fecha validación"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Remito"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Negocio"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Última salida de remito"
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Codigo de barras"
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "¡Ha fallado la modificación de la línea!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Descripción pago"
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Terminal Punto de Venta"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendedor"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturado"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Añadir"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Borrador"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Please provide a partner for the sale."
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Ventas por usuario"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Reembolso"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Por favor, cree una factura por esa venta."
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Cerrar"
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descripción"
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Pagos"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Fecha de Impresión"
 
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index d0258d26334..131265819a8 100644
--- a/addons/point_of_sale/i18n/es_EC.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Confirmar Venta"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplicar descuento"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Hoy"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Agregar producto :"
 
@@ -79,6 +80,8 @@ msgstr "Analisis de Registros"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalles de ventas"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Are you sure you want to close the statements ?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Scanear Producto"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Agregar Pago"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Today's Sales By Current User"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Monto"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "Impuesto"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Origen"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Will put all the orders in waiting status till being accepted"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Cliente"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total of the day"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Average Price"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Disc. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total discount"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Gestión de Caja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "No valid pricelist line found !"
@@ -363,7 +378,8 @@ msgid "Sales by User Monthly"
 msgstr "Sales by User Monthly"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Payment Date"
 
@@ -385,8 +401,8 @@ msgid "To count"
 msgstr "To count"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Summary"
 
@@ -401,10 +417,12 @@ msgid "Delay Payment"
 msgstr "Delay Payment"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantity"
 
@@ -419,7 +437,8 @@ msgid "Period"
 msgstr "Periodo"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Net Total:"
 
@@ -451,9 +470,12 @@ msgid "Print Report"
 msgstr "Print Report"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Unit Price"
 
@@ -479,22 +501,28 @@ msgid "Invoice Amount"
 msgstr "Invoice Amount"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pago"
 
@@ -525,8 +553,8 @@ msgstr ""
 "cashboxes!"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Tributacion"
 
@@ -559,8 +587,8 @@ msgid "Sales total(Revenue)"
 msgstr "Sales total(Revenue)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pagado"
 
@@ -570,8 +598,8 @@ msgid "Check Details"
 msgstr "Check Details"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Qty of product"
 
@@ -604,7 +632,8 @@ msgstr ""
 "Por favor seleccione una antes de seleccionar un producto."
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -660,8 +689,7 @@ msgid "St.Name"
 msgstr "St.Name"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total de Ventas"
 
@@ -671,7 +699,7 @@ msgid "Sum of subtotals"
 msgstr "Suma de subtotales"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Fecha de Pago"
 
@@ -691,6 +719,10 @@ msgid "Today's Sales"
 msgstr "Today's Sales"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -703,7 +735,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Create line failed !"
@@ -715,19 +747,20 @@ msgid "Product Name"
 msgstr "Producto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Accion Invalida !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de precios"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total Facturado"
 
@@ -762,7 +795,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Today's Closed Cashbox"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factura en borrador"
 
@@ -778,7 +811,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Product for Output"
-msgstr "Product for Output"
+msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
@@ -814,7 +847,7 @@ msgid "Disc."
 msgstr "Desc."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "Impuesto :"
 
@@ -829,13 +862,13 @@ msgid "Receipt :"
 msgstr "Recibo :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "unknown"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Fecha"
@@ -872,7 +905,7 @@ msgid "Pos Box Entries"
 msgstr "Detalle de Caja de POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "No puede modificar esta orden. Ya ha sido pagada"
@@ -894,15 +927,14 @@ msgid "Number of Transaction"
 msgstr "Número de transacción"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -948,7 +980,7 @@ msgid "First Name"
 msgstr "Primer Nombre"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Otro"
 
@@ -976,19 +1008,22 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Precio"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Codigo de Barras"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1038,7 +1073,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "¡El nombre del diaro debe ser único por compañía!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Reebolso a Proveedor"
 
@@ -1061,13 +1096,15 @@ msgid "All Closed CashBox"
 msgstr "Todas las cajas cerradas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "No hay list de precios"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Seleccionar una orden abierta"
 
@@ -1077,7 +1114,7 @@ msgid "Order date"
 msgstr "Fecha de Orden"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1093,18 +1130,17 @@ msgstr "Gerente de Ventas"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Orden de Venta"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impuestos"
@@ -1112,12 +1148,13 @@ msgstr "Impuestos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Línea de venta"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Código"
 
@@ -1150,7 +1187,7 @@ msgid "Extra Info"
 msgstr "Info Extra"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1201,8 +1238,14 @@ msgid "Picking List"
 msgstr "Paquete de venta"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Cant."
 
@@ -1220,8 +1263,15 @@ msgid "Sale by User"
 msgstr "Ventas por usuario"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -1349,7 +1399,7 @@ msgid "Customer Note"
 msgstr "Observaciones de cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No order lines defined for this sale."
@@ -1360,7 +1410,10 @@ msgid "Opening Balance"
 msgstr "Saldo inicial"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pagado"
 
@@ -1376,7 +1429,11 @@ msgid "Quotation"
 msgstr "Cotizacion"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1410,7 +1467,7 @@ msgid "Nbr Invoice"
 msgstr "Num. Factura"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Recibo"
 
@@ -1421,15 +1478,15 @@ msgstr "Crear factura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Realizado"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1446,7 +1503,6 @@ msgstr "Abierto"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. venta"
 
@@ -1480,7 +1536,7 @@ msgid "Sales by User Margin"
 msgstr "Sales by User Margin"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Impuestos"
 
@@ -1490,9 +1546,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Point of Sale Orders Statistics"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Producto"
 
@@ -1574,8 +1638,13 @@ msgid "Date Start"
 msgstr "Fecha inicio"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1619,12 +1688,26 @@ msgid "Return lines"
 msgstr "Return lines"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Compania"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Fecha Facturacion"
 
@@ -1676,29 +1759,28 @@ msgid "Error!"
 msgstr "Error!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "No. Of Articles"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Fecha caducidad"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Guia de Remision"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Tienda"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Ultimo Guia de Remision Saliente"
 
@@ -1740,7 +1822,7 @@ msgid "Refunded Quantity"
 msgstr "Devolver cantidad"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Escanear Cod.Barra"
 
@@ -1771,8 +1853,9 @@ msgid "Cancelled Invoice"
 msgstr "Cancelled Invoice"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -1792,18 +1875,18 @@ msgid "Discount "
 msgstr "Discount "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Supplier Invoice"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Modify line failed !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Payment name"
 
@@ -1833,7 +1916,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "¡El código del diario debe ser único por compañía!"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -1896,23 +1979,32 @@ msgid "Message"
 msgstr "Mensaje"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Punto de Venta"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Salesman"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Invoiced"
 
@@ -1929,12 +2021,13 @@ msgid "Discount Notice"
 msgstr "Discount Notice"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Add"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Draft"
 
@@ -1954,12 +2047,12 @@ msgid "POS Payment Report according to date"
 msgstr "POS Payment Report according to date"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Please provide a partner for the sale."
@@ -1978,14 +2071,26 @@ msgid "Cashier"
 msgstr "Cashier"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "User"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Ventas por usuario"
 
@@ -2012,7 +2117,13 @@ msgid "POS Orders lines"
 msgstr "POS Orders lines"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -2023,12 +2134,12 @@ msgid "Sales Journal"
 msgstr "Sales Journal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Refund"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Please create an invoice for this sale."
@@ -2053,7 +2164,16 @@ msgid "Disc(%)"
 msgstr "Disc(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Close"
 
@@ -2105,11 +2225,11 @@ msgid "please check that account is set to %s"
 msgstr "please check that account is set to %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Description"
 
@@ -2205,12 +2325,21 @@ msgid "April"
 msgstr "April"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Payments"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Print Date"
 
@@ -2486,6 +2615,9 @@ msgstr "Year"
 #~ "You have to change either the product,\" \\n                    \" the "
 #~ "quantity or the pricelist."
 
+#~ msgid "Product for expenses"
+#~ msgstr "Product for expenses"
+
 #, python-format
 #~ msgid ""
 #~ "You can not open a Cashbox for \"%s\".\n"
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index ad1de47d48b..b37023c69f1 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.po
@@ -13,23 +13,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Rea loomine ebaõnnestus!"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Vigane tegevus !"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Rea muutmine ebaõnnestus!"
@@ -50,7 +50,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Rakenda allahindlus"
 
@@ -75,7 +76,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Lisa toode :"
 
@@ -97,6 +98,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Müügid Detailselt"
 
@@ -106,7 +109,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Scanneeri toodet"
 
@@ -119,7 +124,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Lisa maksmine :"
 
@@ -140,16 +145,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Kogus"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "Käibemaks"
 
@@ -159,7 +166,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Maks"
 
@@ -174,13 +181,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Päevasumma"
 
@@ -191,19 +199,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Allahindl. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Kokku allahindlus"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Olek"
 
@@ -286,7 +300,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Kehtiv hinnakirja rida ei ole leitud !"
@@ -379,7 +394,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Makse kuupäev"
 
@@ -401,8 +417,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Üldistus"
 
@@ -417,10 +433,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Kogus"
 
@@ -435,7 +453,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Netosumma:"
 
@@ -467,9 +486,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Ühiku hind"
 
@@ -495,22 +517,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Päevik"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Makse"
 
@@ -539,8 +567,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Maksude viisid"
 
@@ -573,8 +601,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Kokku makstud"
 
@@ -584,8 +612,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Toote kogus"
 
@@ -616,7 +644,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Vahesumma"
 
@@ -671,8 +700,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Müük kokku"
 
@@ -682,7 +710,7 @@ msgid "Sum of subtotals"
 msgstr "Vahesummade summa"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Makse kuupäev"
 
@@ -702,6 +730,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -720,13 +752,14 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Hinnakiri"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Kokku arves"
 
@@ -761,7 +794,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Arve mustand"
 
@@ -811,7 +844,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "KM :"
 
@@ -826,13 +859,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "teadmata"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Kuupäev"
@@ -869,7 +902,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Sa ei saa seda orderit muuta. See on juba makstud"
@@ -891,15 +924,14 @@ msgid "Number of Transaction"
 msgstr "Tehingu number"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Tühista"
 
@@ -945,7 +977,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Muu"
 
@@ -973,19 +1005,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Hind"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Ribakood"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1035,7 +1070,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Tarnija tagasimakse"
 
@@ -1058,13 +1093,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Puudub hinnakiri !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Vali Avatud Müügitellimus"
 
@@ -1074,7 +1111,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Baas"
 
@@ -1090,18 +1127,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Märkused"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Müügiorder"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Maksud"
@@ -1109,12 +1145,13 @@ msgstr "Maksud"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Müügi rida"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Tootekood"
 
@@ -1147,7 +1184,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Faks :"
 
@@ -1188,8 +1225,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "kogus"
 
@@ -1207,8 +1250,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Viga !"
@@ -1336,7 +1386,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1347,7 +1397,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Tasutud"
 
@@ -1363,7 +1416,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Kokku:"
 
@@ -1395,7 +1452,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Kviitung"
 
@@ -1406,15 +1463,15 @@ msgstr "Loo arve"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Arve"
 
@@ -1431,7 +1488,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Orderi ref"
 
@@ -1465,7 +1521,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Maksud:"
 
@@ -1475,9 +1531,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Toode"
 
@@ -1558,8 +1622,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Kokku"
 
@@ -1603,12 +1672,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Ettevõte"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Arve Kuupäev"
 
@@ -1657,29 +1740,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Artiklite arv"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Kehtivuse kuupäev"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Noppimine"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Pood"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1721,7 +1803,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Skaneeri ribakood"
 
@@ -1752,8 +1834,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Kinnita"
 
@@ -1773,12 +1856,12 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Tarnija arve"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Makse nimetus"
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Seadistus"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Müügipunkt"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Müügimees"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Arve esitatud"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Lisa"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Mustand"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Ettemaks"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Palun lisa müügipartnerit"
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Kasutaja"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Müük kasutaja kohta"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Viga"
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Tagasimaksmine"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Palun loo arve sellele müügile."
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Sulge"
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Maksed"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Trükkimise kuupäev"
 
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index 9d9b3aa8ba2..597c1f61723 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Laske alennus"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Lisää tuote:"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Myynnin yksityiskohdat"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Skannaa tuote"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Lisää maksu:"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Summa"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "ALV"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Vero"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Kumppani"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Päivän loppusumma"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Ale. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Alennus yhteensä"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Tila"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Kelvollista hinnaston riviä ei löydy!"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Maksun päivämäärä"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Yhteenveto"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Määrä"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Yhteensä netto:"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Yksikköhinta"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Päiväkirja"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Puh.:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Maksu"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Verotustapa"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Yhteensä maksettu"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Tuotteen määrä"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Välisumma"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Myynti yhteensä"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "Välisummat yhteensä"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Maksun päivämäärä"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Kassapääte "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr "Yhteensä:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Rivin luonti epäonnistui!"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Virheellinen toiminto!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Hinnasto"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Laskutettu yhteensä"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Luonnoslasku"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "ALV:"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "tuntematon"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Päivämäärä"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Et voi muokata tätä tilausta. Se on jo maksettu."
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Tapahtuman numero"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Muuta"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Hinta"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Viivakoodi"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Kassapääte"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Toimittajan hyvitys"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ei hinnastoa!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Valitse avoin myyntitilaus"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Pohja"
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Huomautukset"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Myyntitilaus"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Verot"
@@ -1104,12 +1140,13 @@ msgstr "Verot"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Myyntirivi"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Koodi"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Faksi:"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Määrä"
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Virhe!"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Ei tilausrivejä määritetty tälle myynnille."
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Maksettu"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Yhteensä:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Kuitti"
 
@@ -1401,15 +1458,15 @@ msgstr "Luo lasku"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Valmis"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Lasku"
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Tilauksen viite"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Verot:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Tuote"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Yhteensä"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Yritys"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Laskun päivämäärä"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Tuotteiden määrä"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Voimassaolo pvm."
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Keräily"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Myymälä"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Viimeisin keräily ulos"
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Skannaa viivakoodi"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Hyväksy"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Toimittajan lasku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Rivin muokkaus epäonnistui!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Maksun nimi"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Konfiguraatio"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Kassapääte"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Myyjä"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Laskutettu"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Lisää"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Luonnos"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Proforma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Anna kumppani myyntiä varten."
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Käyttäjäkohtaiset myynti"
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Virhe"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Hyvitys"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Luo lasku tälle myynnille."
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Sulje"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Maksut"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Tulostuspäivämäärä"
 
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index c98b071164d..ff5e9ab78d9 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-01-18 16:43+0000\n"
+"PO-Revision-Date: 2011-07-23 01:52+0000\n"
 "Last-Translator: Fabien (Open ERP) \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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Confimer la vente"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Appliquer Remise"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Quotidien"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Ajouter Produit :"
 
@@ -79,6 +80,8 @@ msgstr "Analyse des enregistreuses"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Détail de la vente"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Êtes-vous sûr de vouloir clôturer les relevés ?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Scan de produit"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Jour"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Ajouter un paiement :"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Ventes du jour par utilisateurs actuels"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Montant"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "TVA"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Origine"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Taxe"
 
@@ -158,13 +165,14 @@ msgstr ""
 "acceptation."
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total du Jour"
 
@@ -175,19 +183,25 @@ msgid "Average Price"
 msgstr "Prix moyen"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Rem. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Remise totale"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "État"
 
@@ -270,7 +284,8 @@ msgid "Cash register management"
 msgstr "Gestion des caisses enregistreuses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Aucune ligne de Liste de Prix valide trouvée !"
@@ -365,7 +380,8 @@ msgid "Sales by User Monthly"
 msgstr "Ventes par magasin"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Date de règlement"
 
@@ -387,8 +403,8 @@ msgid "To count"
 msgstr "À compter"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Résumé"
 
@@ -403,10 +419,12 @@ msgid "Delay Payment"
 msgstr "Delai de paiement"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -421,7 +439,8 @@ msgid "Period"
 msgstr "Période"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Total net:"
 
@@ -453,9 +472,12 @@ msgid "Print Report"
 msgstr "Imprimer le rapport"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Prix unitaire"
 
@@ -481,22 +503,28 @@ msgid "Invoice Amount"
 msgstr "Montant de la facture"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Journal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tél. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Paiement"
 
@@ -527,8 +555,8 @@ msgstr ""
 "des caisses confirmées !"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Mode des Taxes"
 
@@ -561,8 +589,8 @@ msgid "Sales total(Revenue)"
 msgstr "Total des ventes(revenu)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total Payé"
 
@@ -572,8 +600,8 @@ msgid "Check Details"
 msgstr "Vérifier les détails"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Qté de Produits"
 
@@ -606,7 +634,8 @@ msgstr ""
 "Veuillez en choisir une avant de choisir un produit"
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Sous-total"
 
@@ -663,8 +692,7 @@ msgid "St.Name"
 msgstr "Nom du relevé"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total des Ventes"
 
@@ -674,7 +702,7 @@ msgid "Sum of subtotals"
 msgstr "Somme des sous-totaux"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Date du paiement"
 
@@ -694,6 +722,10 @@ msgid "Today's Sales"
 msgstr "Les ventes du jour"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Point de Vente "
@@ -706,7 +738,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Échec de création de ligne !"
@@ -718,19 +750,20 @@ msgid "Product Name"
 msgstr "Nom du Produit"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Action incorrecte !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Liste de prix"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total Facturé"
 
@@ -765,7 +798,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caisse fermée d'aujourd'hui"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Facture Brouillon"
 
@@ -817,7 +850,7 @@ msgid "Disc."
 msgstr "Rem."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "TVA"
 
@@ -832,13 +865,13 @@ msgid "Receipt :"
 msgstr "Reçu :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "inconnu"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Date"
@@ -875,7 +908,7 @@ msgid "Pos Box Entries"
 msgstr "Entrées de caisse de point de vente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Paiement déjà effectué: Vous ne pouvez pas modifier cette vente."
@@ -897,15 +930,14 @@ msgid "Number of Transaction"
 msgstr "Nombre de Transactions"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -951,7 +983,7 @@ msgid "First Name"
 msgstr "Prénom"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Autre"
 
@@ -979,19 +1011,22 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Prix"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Code Barre"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Point de vente"
@@ -1041,7 +1076,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Le nom du journal doit être unique dans chaque société !"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Note de Crédit Fournisseur"
 
@@ -1064,13 +1099,15 @@ msgid "All Closed CashBox"
 msgstr "Fermer toute les caisses"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Pas de Liste de Prix !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Sélectionnez une Commande Ouverte"
 
@@ -1080,7 +1117,7 @@ msgid "Order date"
 msgstr "Date de commande"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1096,18 +1133,17 @@ msgstr "Vendeur 2"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notes"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Commande client"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Taxes"
@@ -1115,12 +1151,13 @@ msgstr "Taxes"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Ligne de Vente"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Code"
 
@@ -1153,7 +1190,7 @@ msgid "Extra Info"
 msgstr "Info complémentaire"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1205,8 +1242,14 @@ msgid "Picking List"
 msgstr "Liste de colisage"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Qté"
 
@@ -1224,8 +1267,15 @@ msgid "Sale by User"
 msgstr "Ventes par Utilisateur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -1353,7 +1403,7 @@ msgid "Customer Note"
 msgstr "Note client"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Aucune lignes de commande pour cette vente."
@@ -1364,7 +1414,10 @@ msgid "Opening Balance"
 msgstr "Solde initial"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Payé"
 
@@ -1380,7 +1433,11 @@ msgid "Quotation"
 msgstr "Devis"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1414,7 +1471,7 @@ msgid "Nbr Invoice"
 msgstr "Nbr Facture"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Reçu"
 
@@ -1425,15 +1482,15 @@ msgstr "Créer Facture"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Terminé"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Facture"
 
@@ -1450,7 +1507,6 @@ msgstr "Ouvrir"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Réf. Commande"
 
@@ -1484,7 +1540,7 @@ msgid "Sales by User Margin"
 msgstr "Marges par utilisateurs"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Taxes :"
 
@@ -1494,9 +1550,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Statistiques des commandes du point de vente"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produit"
 
@@ -1579,8 +1643,13 @@ msgid "Date Start"
 msgstr "Date de début"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1624,12 +1693,26 @@ msgid "Return lines"
 msgstr "Lignes de retour"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Société"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Date de Facture"
 
@@ -1681,29 +1764,28 @@ msgid "Error!"
 msgstr "Erreur !"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Nb. d'articles"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Date de validité"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Colisage"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Magasin"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Colisages"
 
@@ -1745,7 +1827,7 @@ msgid "Refunded Quantity"
 msgstr "Qté Remboursée"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Scanner le code barre"
 
@@ -1776,8 +1858,9 @@ msgid "Cancelled Invoice"
 msgstr "Facture annulée"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1797,18 +1880,18 @@ msgid "Discount "
 msgstr "Remise "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Facture fournisseur"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Échec de modification de ligne !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Nom sur le paiement"
 
@@ -1838,7 +1921,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "Le code du journal doit être unique dans chaque société !"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -1902,23 +1985,32 @@ msgid "Message"
 msgstr "Message"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Point de Vente"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendeur"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturée"
 
@@ -1935,12 +2027,13 @@ msgid "Discount Notice"
 msgstr "Note de remise"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Ajouter"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
@@ -1960,12 +2053,12 @@ msgid "POS Payment Report according to date"
 msgstr "Rapport de paiement du point de vente en fonction de la date"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Veuiller renseigner un client"
@@ -1985,14 +2078,26 @@ msgid "Cashier"
 msgstr "Caissier"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Ventes par utilisateur"
 
@@ -2019,7 +2124,13 @@ msgid "POS Orders lines"
 msgstr "Ligne de commandes du point de vente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -2030,12 +2141,12 @@ msgid "Sales Journal"
 msgstr "Journal de ventes"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Remboursement"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Veuillez créer une facture pour cette vente."
@@ -2060,7 +2171,16 @@ msgid "Disc(%)"
 msgstr "Rem (%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Fermer"
 
@@ -2112,11 +2232,11 @@ msgid "please check that account is set to %s"
 msgstr "Vérifier que le compte comptable est mis à %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Description"
 
@@ -2212,12 +2332,21 @@ msgid "April"
 msgstr "Avril"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Paiements"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Date d'impression"
 
@@ -2513,6 +2642,9 @@ msgstr "Année"
 #~ msgid "Miscelleanous Operations"
 #~ msgstr "Opérations diverses"
 
+#~ msgid "Product for expenses"
+#~ msgstr "Produits pour Sortie de Caisse"
+
 #~ msgid ""
 #~ "You can not set discount greater than company discount on %s! Discount "
 #~ "Should be less than %d %s"
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index fe1aa7b0671..344b0f1515d 100644
--- a/addons/point_of_sale/i18n/hi.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "कुल भुगतान"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "उत्पाद की मात्रा"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1104,12 +1140,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1401,15 +1458,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 18196580bed..8181deb09c1 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
 "PO-Revision-Date: 2010-08-03 08:43+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) \n"
+"Last-Translator: Goran Kliska \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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Primjeni popust"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "PDV"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Porez"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Stranka"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Ukupno za dan"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Popust (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stanje"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Datum plaćanja"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Sažetak"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Ukupno netto:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Jedinična cijena"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Uk. plaćeno"
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Kol."
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Ukupno prodaja"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Suma podsuma"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Datum plaćanja"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Ukupno :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cjenik"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Ukupno računi"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "PDV :"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nepoznato"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Datum"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Ostalo"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Bilješke"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Porezi"
@@ -1103,12 +1139,13 @@ msgstr "Porezi"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Šifra"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Kol."
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Plaćeno"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Ukupno:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Račun"
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Tvrtka"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Datum računa"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Komada"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Trgovina"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Očitaj barkod"
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Potvrdi"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Ulazni račun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Naziv plaćanja"
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Postava"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Prodavač"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Fakturirano"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Dodaj"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "U pripremi"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Prodaje po korisniku"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Povrat"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 47e1947d562..cd321f02519 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Eladási hely megerősítve"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Kedvezmény alkalmazása"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Ma"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Termék hozzáadása :"
 
@@ -79,6 +80,8 @@ msgstr "Nyilvántartás elemzése"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Értékesítés részletei"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Biztos benne, hogy le akarja zárni a kivonatokat?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Termék vizsgálata"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Nap"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Mai eladások a jelenlegi felhasználó szerint"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Összeg"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "ÁFA"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Származás"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Adó"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Az elfogadásig minden megrendelést váró státuszba tesz"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Átlagár"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Eng. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Engedmény összesen"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Állapot"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Pénztárkezelés"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "A rendszer nem talált érvényes árlista sort."
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Kifizetés dátuma"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr "Kiszámítandó"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Összegzés"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Mennyiség"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr "Időszak"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Nettó érték:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr "Jelentés kinyomtatása"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Egységár"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr "Számla összege"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Napló"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Átutalás"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Adómódok"
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr "Összes eladás (bevétel)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr "Adatok ellenőrzése"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Termékmenny."
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Részösszeg"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr "Kivonat neve"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Összes eladás"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Részösszegek összege"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Kifizetés dátuma"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr "Mai eladások"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Értékesítési pont "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Összesen :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr "Termék neve"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Érvénytelen művelet !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Árlista"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Számlázott összesen"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Számlatervezet"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr "Eng."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "ÁFA:"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr "Bevétel :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "Ismeretlen"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Dátum"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Nem módosíthatja ezt a megrendelést. Már kifizették."
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Tranzakció száma"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr "Keresztnév"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Egyéb"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr "Felhasználók"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Ár"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Vonalkód"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Értékesítési pont"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "A napló nevének egyedinek kell lennie!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Bejövő jóváíró számla"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr "Minden lezárt pénztár"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nincs árlista !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Nyitott vevői megrendelés kiválasztása"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr "Megrendelés dátuma"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Adóalap"
 
@@ -1085,18 +1122,17 @@ msgstr "Értékesítő menedzser"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Megjegyzések"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Vevői megrendelés"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Adók"
@@ -1104,12 +1140,13 @@ msgstr "Adók"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Értékesítési sor"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Kód"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr "Extra információ"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr "Kiszedési lista"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Menny."
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr "Értékesítés felhasználónként"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Hiba !"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr "Vásárlói megjegyzés"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr "Nyitó egyenleg"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Fizetve"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr "Árajánlat"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Összesen:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr "Szamla száma"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Bevétel"
 
@@ -1401,15 +1458,15 @@ msgstr "Számla készítése"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Kész"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Számla"
 
@@ -1426,7 +1483,6 @@ msgstr "Nyitott"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Rendelési hiv."
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Adók:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Termék"
 
@@ -1554,8 +1618,13 @@ msgid "Date Start"
 msgstr "Kezdő dátum"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Összesen"
 
@@ -1599,12 +1668,26 @@ msgid "Return lines"
 msgstr "Visszáru sorok"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Vállalat"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Számla kelte"
 
@@ -1653,29 +1736,28 @@ msgid "Error!"
 msgstr "Hiba!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Cikkek száma"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Érvényesség dátuma"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Kiszedés"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Üzlet"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1717,7 +1799,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1748,8 +1830,9 @@ msgid "Cancelled Invoice"
 msgstr "Törölt számla"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Jóváhagyás"
 
@@ -1769,18 +1852,18 @@ msgid "Discount "
 msgstr "Engedmény "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Bejövő számla"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1810,7 +1893,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "A napló kódjának egyedinek kell lenni!"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Beállítások"
 
@@ -1873,23 +1956,32 @@ msgid "Message"
 msgstr "Üzenet"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Értékesítési pont"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Értékesítő"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Számlázott"
 
@@ -1906,12 +1998,13 @@ msgid "Discount Notice"
 msgstr "Engedmény megjegyzések"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Tervezet"
 
@@ -1931,12 +2024,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Pro forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1954,14 +2047,26 @@ msgid "Cashier"
 msgstr "Pénztáros"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Értékesítések felhasználók szerint"
 
@@ -1988,7 +2093,13 @@ msgid "POS Orders lines"
 msgstr "Értékesítési pont rendelési tételek"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Hiba"
@@ -1999,12 +2110,12 @@ msgid "Sales Journal"
 msgstr "Kimenő számla napló"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Jóváíró számla"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2029,7 +2140,16 @@ msgid "Disc(%)"
 msgstr "Eng. (%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Zárás"
 
@@ -2081,11 +2201,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Leírás"
 
@@ -2179,12 +2299,21 @@ msgid "April"
 msgstr "Április"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Kifizetések"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Nyomtatás dátuma"
 
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index cd444e5c830..e2671f42a2a 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index 803a569482b..9a94257066b 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-01-15 12:08+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2011-07-23 03:21+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) \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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Conferma Punto Vendita"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Applica Sconto"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Oggi"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Aggiungi Prodotto"
 
@@ -69,7 +70,7 @@ msgstr "Tutti gli incassi del giorno:"
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Metti il denaro"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
@@ -79,6 +80,8 @@ msgstr "Analisi registro"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Dettagli Vendite"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Sicuri di voler chiudere la dichiarazione?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Codice a Barre"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Giorno"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Aggiungi pagamento:"
 
@@ -114,7 +119,7 @@ msgstr "Le mie vendite"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 msgid "Box Out"
-msgstr ""
+msgstr "Esplosione"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Vendite giornaliere per utente attuale"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Importo"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "IVA"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Origine"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Tassa"
 
@@ -157,13 +164,14 @@ msgstr ""
 "Metterà tutti gli ordini in stato di attesa, finché non saranno accettati"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Totale del Giorno"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr "Prezzo medio"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Sconto (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Sconto Totale"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stato"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr "Gestione registro di cassa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Non è stata trovata nessuna riga valida nel listino!"
@@ -339,7 +354,7 @@ msgstr "Operazioni giornaliere"
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Cerca dichiarazione di cassa"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -364,7 +379,8 @@ msgid "Sales by User Monthly"
 msgstr "Vendite mensili per utente"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Data di pagamento"
 
@@ -386,8 +402,8 @@ msgid "To count"
 msgstr "Da conteggiare"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Riepilogo"
 
@@ -402,10 +418,12 @@ msgid "Delay Payment"
 msgstr "Ritardo nel pagamento"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantità"
 
@@ -421,7 +439,8 @@ msgid "Period"
 msgstr "Periodo"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Imponibile Totale"
 
@@ -453,9 +472,12 @@ msgid "Print Report"
 msgstr "Stampa"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Prezzo unitario"
 
@@ -481,22 +503,28 @@ msgid "Invoice Amount"
 msgstr "Importo Fattura"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Registro"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pagamento"
 
@@ -527,8 +555,8 @@ msgstr ""
 "registratori di cassa confermati!"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Modalità Tasse"
 
@@ -548,7 +576,7 @@ msgstr "Errore: Codice EAN non valido"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Dichiarazioni aperte"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -561,8 +589,8 @@ msgid "Sales total(Revenue)"
 msgstr "Vendite totali (Entrate)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Totale pagato"
 
@@ -572,8 +600,8 @@ msgid "Check Details"
 msgstr "Controllare i dettagli"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Quantità Prodotto"
 
@@ -606,7 +634,8 @@ msgstr ""
 "Selezionarne uno prima di scegliere un prodotto."
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotale"
 
@@ -615,7 +644,7 @@ msgstr "Subtotale"
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Dichiarazioni chiuse"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -660,11 +689,10 @@ msgstr ""
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "Nome dich."
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Totale Vendite"
 
@@ -674,7 +702,7 @@ msgid "Sum of subtotals"
 msgstr "Somma Subtotali"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Data Pagamento"
 
@@ -694,6 +722,10 @@ msgid "Today's Sales"
 msgstr "Vendite di oggi"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Punto Vendita "
@@ -706,7 +738,7 @@ msgid "Total :"
 msgstr "Totale :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Fallita la creazione della linea !"
@@ -718,19 +750,20 @@ msgid "Product Name"
 msgstr "Descrizione Prodotto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Azione non valida"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Listino Prezzi"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Totale Fatturato"
 
@@ -765,7 +798,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Chiusura giornaliera registratore di cassa"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Bozza Fattura"
 
@@ -775,6 +808,7 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"L'importo del documento deve essere lo stesso della linea del resoconto"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -812,10 +846,10 @@ msgstr "Imposte:"
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Disc."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "Partita IVA:"
 
@@ -830,13 +864,13 @@ msgid "Receipt :"
 msgstr "Ricevuta:"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "Sconosciuto"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Data"
@@ -873,7 +907,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Non si può modificare quest'ordine. È già stato pagato"
@@ -895,15 +929,14 @@ msgid "Number of Transaction"
 msgstr "Numero di transazioni"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -941,7 +974,7 @@ msgstr "Vendita per utenti"
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Pagamento per vendita"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
@@ -949,7 +982,7 @@ msgid "First Name"
 msgstr "Nome"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Altro"
 
@@ -968,7 +1001,7 @@ msgstr "Importo Totale"
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Registri di cassa"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -977,19 +1010,22 @@ msgid "Users"
 msgstr "Utenti"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Prezzo"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Codice a barre"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Punto Vendita"
@@ -1008,7 +1044,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "Periodo di inizio"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1039,7 +1075,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Il nome del registro deve essere unico per ogni azienda!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Rimborso Fornitore"
 
@@ -1062,13 +1098,15 @@ msgid "All Closed CashBox"
 msgstr "Tutti i registratori di cassa chiusi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nessun Listino Prezzi !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Seleziona un ordine di vendita aperto"
 
@@ -1078,7 +1116,7 @@ msgid "Order date"
 msgstr "Data dell'ordine"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1094,18 +1132,17 @@ msgstr "Manager commerciale"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Note"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Ordine di Vendita"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Tasse"
@@ -1113,12 +1150,13 @@ msgstr "Tasse"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Riga Vendita"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Codice"
 
@@ -1151,7 +1189,7 @@ msgid "Extra Info"
 msgstr "Informazioni aggiuntive"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1179,7 +1217,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Metodo di prezzo"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -1192,8 +1230,14 @@ msgid "Picking List"
 msgstr "Picking List"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Qta'"
 
@@ -1211,8 +1255,15 @@ msgid "Sale by User"
 msgstr "Vendita per utente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Errore !"
@@ -1247,7 +1298,7 @@ msgstr "Prego fornire un conto per il prodotto: %s"
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Convalida ritardo"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1257,13 +1308,13 @@ msgstr "Numero di copie da stampare"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "Pagamento POS"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Periodo finale"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
@@ -1302,7 +1353,7 @@ msgstr "Ordini di Vendita Punto Vendita"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Nome della dichiarazione"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1340,7 +1391,7 @@ msgid "Customer Note"
 msgstr "Note cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nessuna riga ordine definita in questa vendita."
@@ -1348,10 +1399,13 @@ msgstr "Nessuna riga ordine definita in questa vendita."
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Bilancio d'apertura"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pagato"
 
@@ -1364,10 +1418,14 @@ msgstr "Tutte le righe delle vendite"
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Preventivo"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Totale:"
 
@@ -1384,7 +1442,7 @@ msgstr "Configurazione giornale"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Voci del movimento"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1399,7 +1457,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Ricevuta"
 
@@ -1410,15 +1468,15 @@ msgstr "Crea la fattura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Completato"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Fattura"
 
@@ -1435,7 +1493,6 @@ msgstr "Apri"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Rif. Ordine"
 
@@ -1469,7 +1526,7 @@ msgid "Sales by User Margin"
 msgstr "Margine vendite per utente"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Tasse:"
 
@@ -1479,9 +1536,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Statistiche ordini POS"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Prodotto"
 
@@ -1493,12 +1558,12 @@ msgstr "Righe Punto Vendita"
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "Controllo sconto"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Bilancio di chiusura"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -1539,6 +1604,7 @@ msgstr "Sì"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Non è definito alcun conto di ricavo per questo prodotto:\"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
@@ -1562,8 +1628,13 @@ msgid "Date Start"
 msgstr "Data inizio"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Totale"
 
@@ -1581,7 +1652,7 @@ msgstr ""
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Dichiarazione"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1591,7 +1662,7 @@ msgstr "Descrizione Ordine"
 #. module: point_of_sale
 #: field:pos.make.payment,num_sale:0
 msgid "Num.File"
-msgstr ""
+msgstr "Num. file"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
@@ -1604,15 +1675,29 @@ msgstr "Report pagamenti"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "Ritorna linee"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Azienda"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Data della fattura"
 
@@ -1661,41 +1746,40 @@ msgid "Error!"
 msgstr "Errore!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "N. Di Articoli"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Data Validità"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Presa"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Negozio"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Ultimo raccolta in uscita"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Voce del movimento bancario"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Estratto conto"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
@@ -1722,10 +1806,10 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
 msgid "Refunded Quantity"
-msgstr ""
+msgstr "Quantità resa"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Scansione codice a barre"
 
@@ -1756,8 +1840,9 @@ msgid "Cancelled Invoice"
 msgstr "Fattura annullata"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -1777,18 +1862,18 @@ msgid "Discount "
 msgstr "Sconto "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Fattura Fornitore"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Modifica riga fallita!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Nome del pagamento"
 
@@ -1818,7 +1903,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "Il codice del registro deve essere unico per una stessa azienda!"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -1860,13 +1945,13 @@ msgstr "Sconto totale"
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Prendi denaro"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Dettagli vendite"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
@@ -1881,23 +1966,32 @@ msgid "Message"
 msgstr "Messaggio"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Punto Vendita"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Venditore"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Fatturato"
 
@@ -1906,20 +2000,21 @@ msgstr "Fatturato"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "N°"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Note sconto"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Aggiungi"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Bozza"
 
@@ -1931,7 +2026,7 @@ msgstr "Riga Ordine Punto Vendita"
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "Sei sicuro di voler aprire le dichiarazioni?"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
@@ -1939,12 +2034,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Pro-Forma"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Prego fornire un partner per la vendita"
@@ -1959,17 +2054,29 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
 msgid "Cashier"
-msgstr ""
+msgstr "Cassiere"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Utente"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Vendite per Utente"
 
@@ -1996,7 +2103,13 @@ msgid "POS Orders lines"
 msgstr "Righe ordini POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Errore"
@@ -2007,12 +2120,12 @@ msgid "Sales Journal"
 msgstr "Giornale Vendite"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Rimborso"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Prego creare una fattura per questa vendita."
@@ -2037,7 +2150,16 @@ msgid "Disc(%)"
 msgstr "Sconto (%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Chiudi"
 
@@ -2089,11 +2211,11 @@ msgid "please check that account is set to %s"
 msgstr "prego verificare che il conto sia impostato su %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descrizione"
 
@@ -2149,7 +2271,7 @@ msgstr "Cliente"
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Advance"
-msgstr ""
+msgstr "Avanza"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
@@ -2173,7 +2295,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,remboursed:0
 msgid "Remboursed"
-msgstr ""
+msgstr "Rimborsato"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
@@ -2187,12 +2309,21 @@ msgid "April"
 msgstr "Aprile"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Pagamenti"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Data di stampa"
 
@@ -2414,6 +2545,10 @@ msgstr "Anno"
 #~ msgid "Company:"
 #~ msgstr "Azienda:"
 
+#, python-format
+#~ msgid "Cannot create invoice without a partner."
+#~ msgstr "Partner obbligatorio per generare fattura"
+
 #~ msgid "Net Total"
 #~ msgstr "Totale netto"
 
@@ -2446,3 +2581,15 @@ msgstr "Anno"
 
 #~ msgid "This is the salesman actually making the order."
 #~ msgstr "Questo è il venditore che attualmente sta facendo l'ordine"
+
+#~ msgid "Product for expenses"
+#~ msgstr "Prodotto per spese"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "ErroreUtente"
+
+#, python-format
+#~ msgid "Cannot delete a point of sale which is already confirmed !"
+#~ msgstr ""
+#~ "Impossibile eliminare un oggetto in vendita che è già stato confermato !"
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 0bad0a5c2ab..4fda7ee9c1d 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "할인 적용"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "상품 추가:"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "판매 상세 내역"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "상품 스캔"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "결제 주가:"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "금액"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "세금"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "파트너"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "일일 합계"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "총 할인"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "상태"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "유효한 가격리스트 라인이 없습니다!"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "결제 날짜"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "요약"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "수량"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "순 합계:"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "단가"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "저널"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "결제"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "세금 모드"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "총 결제액"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "상품 수량"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "소계"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "총 판매액"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "소계 합계"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "결제 날짜"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "라인 생성 실패!"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "유효하지 않은 액션!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "가격리스트"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "총 인보이스 금액"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "인보이스 초안"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "알려지지 않음"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "날짜"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "이 주문을 수정할 수 없습니다. 이미 지불됨."
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "거래 수"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "취소"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "기타"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "가격"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "바코드"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "공급자 환불"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "가격리스트가 없음!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "오픈 판매 주문을 선택"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "베이스"
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "노트"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "판매 주문"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "세금"
@@ -1104,12 +1140,13 @@ msgstr "세금"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "판매 라인"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "코드"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "팩스 :"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "수량"
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "에러 !"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "이 판매에 정의된 주문 라인이 없음."
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "결제됨"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "합계:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "영수"
 
@@ -1401,15 +1458,15 @@ msgstr "인보이스 생성"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "완료"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "인보이스"
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "주문 참조"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "세금:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "상품"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "합계"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "회상"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "인보이스 날짜"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "검증 날짜"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "피킹"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "샵"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "최종 아웃풋 피킹"
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "바코드 스캔"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "확정"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "공급자 인보이스"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "라인 수정 실패!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "결제 이름"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "구성"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "POS"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "판매 사원"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "인보이스됨"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "추가"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "초안"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "프로포마"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "이 판매의 파트너를 기입하십시오."
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "사용자"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "사용자별 판매"
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "에러"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "환불"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "이 판매의 인보이스를 생성하십시오."
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "닫기"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "설명"
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "결제"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "인쇄 날짜"
 
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index a5e452458a4..12ef589a7b7 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Nustatymai"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 9bd79ac9cbf..8c2e85d76c1 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Хөнгөлөлт тооцох"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Бараа нэмэх"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Борлуулалтын дэлгэрэнгүй"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Бараа унших"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Төлбөр нэмэх"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Дүн"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "НӨАТ"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Татвар"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Өдрийн дүн"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Хөнг.(%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Нийт хөнгөлөлт"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Төлөв"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Зөв үнийн жагсаалт олдсонгүй!"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Төлбөрийн Огноо"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Хураангуй"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Тоо ширхэг"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Цэвэр дүн"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Нэгж үнэ"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Журнал"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Тел.:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Төлбөр"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Татварын Горим"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Төлсөн дүн"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Барааны тоо"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Дэд дүн"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Борлуулалтын Дүн"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "Дэд дүнгүүдийн нийлбэр"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Төлбөрийн огноо"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "ПОС "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr "Нийт :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Мөр нэмэхэд алдаа гарлаа!"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Буруу үйлдэл!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Үнийн жагсаалт"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Нэхэмжилсэн дүн"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Ноорог Нэхэмжлэл"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "НӨАТ:"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "тодорхойгүй"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Огноо"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Төлбөр хийгдсэн учраас энэ ордерыг өөрчилж болохгүй."
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Гүйлгээний тоо"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Бусад"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Үнэ"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Баар код"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "ПОС"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Нийлүүлэгчийн Буцаалт"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Үнийн жагсаалт алга!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Суурь"
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Тэмдэглэл"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Борлуулалтын Ордер"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Татвар"
@@ -1104,12 +1140,13 @@ msgstr "Татвар"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Код"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Факс"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Тоо"
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Алдаа!"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Төлсөн"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Нийт:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Талон"
 
@@ -1401,15 +1458,15 @@ msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Дууссан"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Нэхэмжлэл"
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ордер Заалт"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Татварууд"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Бараа"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Нийт"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Компани"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Нэхэмжилсэн Огноо"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Хүчинтэй огноо"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Түүвэр"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Дэлгүүр"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Бааркод унших"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Бататгах"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Нийлүүлэгчийн Нэхэмжлэл"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Төлөлтийн нэр"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Тохиргоо"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "ПОС"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Борлуулагч"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Нэхэмжилсэн"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Нэмэх"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Ноорог"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Харилцагчийг сонгоно уу."
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Хэрэглэгч"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Борлуулалтын ажилтнаар"
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Алдаа"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Буцаалт"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Энэ борлуулалтад нэхэмжлэл үүсгэнэ үү."
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Хаах"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Тайлбар"
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Төлбөр"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Хэвлэсэн Огноо"
 
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index d7dd3e5ba65..6097a3784a6 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Korting toekennen"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Vandaag"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Product toevoegen :"
 
@@ -79,6 +80,8 @@ msgstr "Kasregister analyse"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Verkoopdetails"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Weet u zeker dat u de afschriften wilt sluiten?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Product scannen"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Dag"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Betaling toevoegen :"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Dagverkopen van huidige gebruiker"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Bedrag"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "BTW"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Oorsprong"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Belasting"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Zet alle orders in wacht status tot acceptatie"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Dagtotaal"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Gemiddelde prijs"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Korting (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Totaal korting"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Status"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Kasregister beheer"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Geen geldige prijslijst regel gevonden!"
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Aanmaken regel mislukt!"
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Ongeldige actie!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "U kunt deze order niet wijzigen. Deze is inmiddels betaald"
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Geen prijslijst!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Fout!"
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Geen orderregels aanwezig voor deze verkoop"
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Wijzig foutieve regel!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Instellingen"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Kies een relatie voor deze verkoop"
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Maak a.u.b. een faktuur van deze verkoop"
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 3d7f392cb2b..960ae6b4ea7 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index aff595ac16a..526d807ac62 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Potwierdź punkt sprzedaży"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Zastosuj upust"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Dziś"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Dodaj produkt :"
 
@@ -79,6 +80,8 @@ msgstr "Analiza rejestru"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Szczegóły sprzedaży"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Skanuj produkt"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Dzień"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Dodaj płatnośc :"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Dzisiejsza sprzedaż wg użytkownika"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Kwota"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "VAT"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Pochodzenie"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Podatek"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Suma dnia"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Cena przeciętna"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Up. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Łączny upust"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stan"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Zarządzanie kasą"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Nie znaleziono poprawnej pozycji cennika !"
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Data płatności"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr "Do policzenia"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Podsumowanie"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Ilość"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr "Okres"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Suma netto:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr "Drukuj raport"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Cena jednostkowa"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr "Kwotra faktury"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Dziennik"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Płatność"
 
@@ -523,8 +551,8 @@ msgstr ""
 "potwierdzone kasy !"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Tryb podatków"
 
@@ -557,8 +585,8 @@ msgid "Sales total(Revenue)"
 msgstr "Suma sprzedaży (dochód)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Suma zapłacona"
 
@@ -568,8 +596,8 @@ msgid "Check Details"
 msgstr "Sprawdż szczegóły"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Ilość produktu"
 
@@ -602,7 +630,8 @@ msgstr ""
 "Ustaw go przed wybraniem produktu."
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Suma częściowa"
 
@@ -657,8 +686,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Suma sprzedaży"
 
@@ -668,7 +696,7 @@ msgid "Sum of subtotals"
 msgstr "Podsuma"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Data płatności"
 
@@ -688,6 +716,10 @@ msgid "Today's Sales"
 msgstr "Dzisiejsza sprzedaż"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -700,7 +732,7 @@ msgid "Total :"
 msgstr "Suma :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Tworzenie pozycji nieudane !"
@@ -712,19 +744,20 @@ msgid "Product Name"
 msgstr "Nazwa produktu"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Niedozwolona akcja !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cennik"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Łącznie zafakturowano"
 
@@ -759,7 +792,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Projekt faktury"
 
@@ -809,7 +842,7 @@ msgid "Disc."
 msgstr "Upust"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "VAT :"
 
@@ -824,13 +857,13 @@ msgid "Receipt :"
 msgstr "Paragon :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nieznany"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Data"
@@ -867,7 +900,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Nie możesz modyfikowac tego zamówienia. Już jest zapłacone."
@@ -889,15 +922,14 @@ msgid "Number of Transaction"
 msgstr "Numer transakcji"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -943,7 +975,7 @@ msgid "First Name"
 msgstr "Imię"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Inne"
 
@@ -971,19 +1003,22 @@ msgid "Users"
 msgstr "Użytkownicy"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Cena"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Kod kreskowy"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Punkt sprzedaży"
@@ -1033,7 +1068,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Nazwa dziennika musi być unikalna w firmie !"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
@@ -1056,13 +1091,15 @@ msgid "All Closed CashBox"
 msgstr "Wszystkie zamknięte kasy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Brak cennika !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Wybierz otwarte zamówienie odbiorcy"
 
@@ -1072,7 +1109,7 @@ msgid "Order date"
 msgstr "Data zamówienia"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Podstawa"
 
@@ -1088,18 +1125,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Uwagi"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Zamówienie sprzedaży"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Podatki"
@@ -1107,12 +1143,13 @@ msgstr "Podatki"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Pozycja sprzedaży"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Kod"
 
@@ -1145,7 +1182,7 @@ msgid "Extra Info"
 msgstr "Dodatkowe informacje"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Faks :"
 
@@ -1186,8 +1223,14 @@ msgid "Picking List"
 msgstr "Pobranie"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Il."
 
@@ -1205,8 +1248,15 @@ msgid "Sale by User"
 msgstr "Sprzedaż wg użytkowników"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Błąd !"
@@ -1334,7 +1384,7 @@ msgid "Customer Note"
 msgstr "Notatka klienta"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nie ma pozycji zamówienia dla tej sprzedaży."
@@ -1345,7 +1395,10 @@ msgid "Opening Balance"
 msgstr "Bilans otwarcia"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Zapłacone"
 
@@ -1361,7 +1414,11 @@ msgid "Quotation"
 msgstr "Oferta"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Razem:"
 
@@ -1393,7 +1450,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Paragon"
 
@@ -1404,15 +1461,15 @@ msgstr "Utwórz fakturę"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Gotowe"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -1429,7 +1486,6 @@ msgstr "Otwarte"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Numer zamówienia"
 
@@ -1463,7 +1519,7 @@ msgid "Sales by User Margin"
 msgstr "Sprzedaż wg marży użytkownika"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Podatki:"
 
@@ -1473,9 +1529,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
@@ -1556,8 +1620,13 @@ msgid "Date Start"
 msgstr "Data rozpoczęcia"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Razem"
 
@@ -1601,12 +1670,26 @@ msgid "Return lines"
 msgstr "Pozycje zwrotów"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Firma"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Data wystawienia faktury"
 
@@ -1655,29 +1738,28 @@ msgid "Error!"
 msgstr "Błąd!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Liczba artykułów"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Data ważności"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Pobranie"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Sklep"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Ostatnie wydanie"
 
@@ -1719,7 +1801,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Skanuj kod kreskowy"
 
@@ -1750,8 +1832,9 @@ msgid "Cancelled Invoice"
 msgstr "Anulowana faktura"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -1771,18 +1854,18 @@ msgid "Discount "
 msgstr "Upust "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Faktura dostawcy"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Modyfikacja pozycji nieudana !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Nazwa płatności"
 
@@ -1812,7 +1895,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "Kod dziennika musi być unikalny w firmie !"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -1875,23 +1958,32 @@ msgid "Message"
 msgstr "Wiadomość"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Punkt sprzedaży"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Sprzedawca"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Zafakturowane"
 
@@ -1908,12 +2000,13 @@ msgid "Discount Notice"
 msgstr "Notatka upustu"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Dodaj"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Projekt"
 
@@ -1933,12 +2026,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Proszę wprowadzić partnera dla sprzedaży."
@@ -1956,14 +2049,26 @@ msgid "Cashier"
 msgstr "Kasjer"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Sprzedaż wg. użytkownika"
 
@@ -1990,7 +2095,13 @@ msgid "POS Orders lines"
 msgstr "Pozycje zamówienia PS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Błąd"
@@ -2001,12 +2112,12 @@ msgid "Sales Journal"
 msgstr "Dziennik sprzedaży"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Korekta"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Przoszę utworzyć fakturę dla tej sprzedaży."
@@ -2031,7 +2142,16 @@ msgid "Disc(%)"
 msgstr "Up(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Zamknij"
 
@@ -2083,11 +2203,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Opis"
 
@@ -2181,12 +2301,21 @@ msgid "April"
 msgstr "Kwiecień"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Płatności"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Data wydruku"
 
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index ea2d62aa43b..7b58d420cbb 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-20 20:14+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) \n"
+"PO-Revision-Date: 2011-07-23 01:39+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) \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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr "Confirmação de Ponto de Venda"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplicar Desconto"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Hoje"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Adicionar produto :"
 
@@ -79,6 +80,8 @@ msgstr "Análise de Folhas de Caixa"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalhes das vendas"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Confirma o encerramento dos extractos ?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Scanear produto"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Adicionar pagamento :"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Vendas do Dia do Utilizador Actual"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Montante"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "IVA"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr "Origem"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Imposto"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Colocará todas as encomendas em estado de espera até serem aceites"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Terceiro"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total do dia"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Preço médio"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total do desconto"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Gestão de Folhas de Caixa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Não foi possível encontrar uma linha de lista de preços válida !"
@@ -363,7 +378,8 @@ msgid "Sales by User Monthly"
 msgstr "Vendas mensais, por utilizador"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Data de Pagamento"
 
@@ -385,8 +401,8 @@ msgid "To count"
 msgstr "Para Contar"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Sumário"
 
@@ -401,10 +417,12 @@ msgid "Delay Payment"
 msgstr "Atraso no Pagamento"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -419,7 +437,8 @@ msgid "Period"
 msgstr "Período"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Total Liquido:"
 
@@ -451,9 +470,12 @@ msgid "Print Report"
 msgstr "Imprimir Relatório"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Preço Unitário"
 
@@ -479,22 +501,28 @@ msgid "Invoice Amount"
 msgstr "Montante da Factura"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Diário"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pagamento"
 
@@ -525,8 +553,8 @@ msgstr ""
 "confirmadas!"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Modo de Impostos"
 
@@ -559,8 +587,8 @@ msgid "Sales total(Revenue)"
 msgstr "Total de Vendas(Retorno)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pago"
 
@@ -570,8 +598,8 @@ msgid "Check Details"
 msgstr "Detalhes do Cheque"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Quant. do produto"
 
@@ -604,7 +632,8 @@ msgstr ""
 "Por favor seleccione uma antes de escolher o produto."
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Sub-total"
 
@@ -659,8 +688,7 @@ msgid "St.Name"
 msgstr "Nome Rua"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total Vendas"
 
@@ -670,7 +698,7 @@ msgid "Sum of subtotals"
 msgstr "Soma dos sub-totais"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Data de pagamento"
 
@@ -690,6 +718,10 @@ msgid "Today's Sales"
 msgstr "Vendas do Dia"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Ponto de Venda "
@@ -702,7 +734,7 @@ msgid "Total :"
 msgstr "Total:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "A criação da linha falhou !"
@@ -714,19 +746,20 @@ msgid "Product Name"
 msgstr "Nome do Produto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Acção inválida !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de Preços"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total facturado"
 
@@ -761,7 +794,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caixas Fechadas de Hoje"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factura Rascunho"
 
@@ -811,7 +844,7 @@ msgid "Disc."
 msgstr "Desc."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "IVA:"
 
@@ -826,13 +859,13 @@ msgid "Receipt :"
 msgstr "Recibo:"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconhecido"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Data"
@@ -869,7 +902,7 @@ msgid "Pos Box Entries"
 msgstr "Movimentos de Caixa do Posto de Venda"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Não pode modificar esta ordem de venda. Já foi paga"
@@ -891,15 +924,14 @@ msgid "Number of Transaction"
 msgstr "Número da Transação"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -945,7 +977,7 @@ msgid "First Name"
 msgstr "Nome Próprio"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Outro"
 
@@ -973,19 +1005,22 @@ msgid "Users"
 msgstr "Utilizadores"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Preço"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Código de Barras"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Posto de Vendas"
@@ -1035,7 +1070,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "O nome do diário deve ser único para cada empresa!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Reembolso de Fornecedor"
 
@@ -1058,13 +1093,15 @@ msgid "All Closed CashBox"
 msgstr "Todas as Caixas Fechadas"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Selecione uma Ordem de Venda em Aberto"
 
@@ -1074,7 +1111,7 @@ msgid "Order date"
 msgstr "Data da Ordem de Venda"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1090,18 +1127,17 @@ msgstr "Gestor de Vendedores"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Ordem de Venda"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impostos"
@@ -1109,12 +1145,13 @@ msgstr "Impostos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Linha de Venda"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Código"
 
@@ -1147,7 +1184,7 @@ msgid "Extra Info"
 msgstr "Informação Extra"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1199,8 +1236,14 @@ msgid "Picking List"
 msgstr "Lista de Recolha"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Qt"
 
@@ -1218,8 +1261,15 @@ msgid "Sale by User"
 msgstr "Venda por Utilizador"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Erro !"
@@ -1347,7 +1397,7 @@ msgid "Customer Note"
 msgstr "Nota de Cliente"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Não estão definidas linhas para esta ordem de venda"
@@ -1358,7 +1408,10 @@ msgid "Opening Balance"
 msgstr "Saldo Inicial"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pago"
 
@@ -1374,7 +1427,11 @@ msgid "Quotation"
 msgstr "Cotação"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1408,7 +1465,7 @@ msgid "Nbr Invoice"
 msgstr "Nº de Factura"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Recebido"
 
@@ -1419,15 +1476,15 @@ msgstr "Factura Criada"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Feito"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1444,7 +1501,6 @@ msgstr "Em aberto"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. da Ordem de Venda"
 
@@ -1478,7 +1534,7 @@ msgid "Sales by User Margin"
 msgstr "Vendas Por Margem de Utilizador"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Impostos:"
 
@@ -1488,9 +1544,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Estatísticas de Ordens do Ponto de Venda"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produto"
 
@@ -1572,8 +1636,13 @@ msgid "Date Start"
 msgstr "Data de Inicio"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1617,12 +1686,26 @@ msgid "Return lines"
 msgstr "Linhas de Retorno"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Data da Factura"
 
@@ -1674,29 +1757,28 @@ msgid "Error!"
 msgstr "Erro!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Nº de Produtos"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Data de Validade"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Embalagem"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Loja"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Última Recolha de Saída"
 
@@ -1738,7 +1820,7 @@ msgid "Refunded Quantity"
 msgstr "Quantidade Devolvida"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Scanear Código de Barras"
 
@@ -1769,8 +1851,9 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1790,18 +1873,18 @@ msgid "Discount "
 msgstr "Desconto "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Factura de fornecedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Falha na Modificação da linha !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Designação do pagamento"
 
@@ -1831,7 +1914,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "O código do diário deve ser único, para cada empresa!"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -1894,23 +1977,32 @@ msgid "Message"
 msgstr "Mensagem"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Ponto de Venda"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendedor"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturado"
 
@@ -1927,12 +2019,13 @@ msgid "Discount Notice"
 msgstr "Aviso de Desconto"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Adicionar"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
@@ -1952,12 +2045,12 @@ msgid "POS Payment Report according to date"
 msgstr "Relatório de Pagamentos de POS de acordo com a data"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por Favor forneça um terceiro para a venda"
@@ -1976,14 +2069,26 @@ msgid "Cashier"
 msgstr "Operador de Caixa"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Vendas por utilizador"
 
@@ -2010,7 +2115,13 @@ msgid "POS Orders lines"
 msgstr "Linhas de Ordem de Venda de POS"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -2021,12 +2132,12 @@ msgid "Sales Journal"
 msgstr "Diário de Vendas"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Reembolso"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Por favor, criar uma factura para esta venda."
@@ -2051,7 +2162,16 @@ msgid "Disc(%)"
 msgstr "Desc.(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Fechar"
 
@@ -2103,11 +2223,11 @@ msgid "please check that account is set to %s"
 msgstr "Verificar se a conta está definida para %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -2203,12 +2323,21 @@ msgid "April"
 msgstr "Abril"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Pagamentos"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Data de Impressão"
 
@@ -2461,3 +2590,6 @@ msgstr "Ano"
 
 #~ msgid "Sortie de caisse"
 #~ msgstr "Saída de caixa"
+
+#~ msgid "Product for expenses"
+#~ msgstr "Produto para despesas"
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index bf2472cd7bf..5f611f8e931 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.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: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-02-28 20:57+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2011-07-23 01:46+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) \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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplicar Desconto"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Hoje"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Adicionar produto"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalhes das Vendas"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Pesquisar Produtos"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Dia"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Adicionar Pagamento:"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Vendas de Hoje do Usuário Atual"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Quantidade"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "Imposto"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Imposto"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total do Dia"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Preço Médio"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Desconto (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total de Desconto"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Gerenciamento do Registro de Caixa"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Nenhuma linha de lista de preços válida encontrada!"
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr "Vendas Mensais por Usuário"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Data de Pagamento"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Resumo"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr "Período"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Total líquido:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr "Imprimir Relatório"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Preço unitário"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr "Valor da Fatura"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Registro"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pagamento"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Modo de Tributação"
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr "Vendas Totais"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pago"
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Qtd de Produtos"
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total de Vendas"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Soma dos Subtotais"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Data de Pagamento"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr "Vendas de Hoje"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Venda "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Falha na criação da linha !"
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr "Nome do Produto"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Ação Inválida !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de preço"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total Faturado"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Fatura Provisória"
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr "Desc."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "Imposto:"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "Desconhecido"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Data"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Você não pode modificar este pedido, pois ele já foi pago"
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr "Número da Transação"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr "Primeiro Nome"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Outro"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Preço"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Código de barras"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Ponto de Venda"
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Reembolso a fornecedor"
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Sem Lista de Preços !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Selecione uma Ordem de Venda Aberta"
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr "Data do Pedido"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Base"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Ordem de Venda"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impostos"
@@ -1103,12 +1139,13 @@ msgstr "Impostos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Linha de Venda"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Código"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr "Info. Extra"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Qtd"
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Erro!"
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Sem linhas de pedido definidas nesta venda."
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pago"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Recibo"
 
@@ -1400,15 +1457,15 @@ msgstr "Criar Fatura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Concluído"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Referência da Ordem"
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Taxas:"
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produto"
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Data da Fatura"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Núm. de Artigos"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Data de Validade"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Separação"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Loja"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Ler Código de Barras"
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Fatura do Fornecedor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Falha na modificação da Linha!"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Nome da Forma de Pagamento"
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Ponto de Venda"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendedor"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Faturado"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Adicionar"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Esboço"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Usuário"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Vendas do Usuário"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Reembolso"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Fechar"
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descrição"
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Pagamentos"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
@@ -2398,3 +2527,6 @@ msgstr ""
 
 #~ msgid "Company:"
 #~ msgstr "Empresa:"
+
+#~ msgid "Product for expenses"
+#~ msgstr "Produto para Despesas"
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index b9a9c4bcbea..4aaf0856f6f 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Aplicare discount"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Adăugare produs:"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalii vânzare"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Scanare produs"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Adăugare plată:"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Sumă"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "TVA"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Taxă"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partener"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total zilnic"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Disc. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Discount total"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stare"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Data plăţii"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Rezumat"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Cantitate"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Total net :"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Preţ unitar"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Jurnal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Plată"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Mod taxare"
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total plătit"
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Cantitate"
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total vânzari"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Suma subtotalurilor"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Data plăţii"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Total :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Lista de preturi"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total facturat"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factură ciornă"
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "TVA :"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "necunoscut"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Dată"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr "Numărul tranzacţiei"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Revocare"
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Altele"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Preț"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Cod de bare"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Restituire de la furnizor"
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Selectare comandă deschisă"
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Bază"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Note"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Comadă vânzare"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Taxe"
@@ -1103,12 +1139,13 @@ msgstr "Taxe"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Rând vânzare"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Cod"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Cant."
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Plătit"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Total:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Bon"
 
@@ -1400,15 +1457,15 @@ msgstr "Creare factură"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Gata"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factură"
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. Comanda"
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Taxe:"
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produs"
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Companie"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Data facturii"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Nr de articole"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Data expirării"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Selecţie"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Magazin"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Ultima selecţie de ieşire"
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Scanare cod de bare"
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Confirmare"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Factură furnizor"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Denumire plată"
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Configurare"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Punct de vânzare"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vânzător"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturat"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Adăugare"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Ciornă"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Proformă"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Utilizator"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Vânzări per utilizator"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Restituire"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Închidere"
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Descriere"
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Plăţi"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Data tipăririi"
 
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index 6d119a7d14d..8ad47f7abbf 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -13,26 +13,27 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
 msgid "Discount Notes"
-msgstr ""
+msgstr "Заметки о скидках"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Продажи за день"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Point of Sale Confirm"
-msgstr ""
+msgstr "Подтверждение от ТП"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Применить скидку"
 
@@ -54,43 +55,47 @@ msgstr "Точка продажи"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Cегодня"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
-msgstr "Добавить продукцию"
+msgstr "Добавить продукт:"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
 msgid "All Cashboxes Of the day :"
-msgstr ""
+msgstr "Все кассовые ящики за день:"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Положить деньги"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Зарегистрировать анализ"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Подробности продаж"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 msgid "Are you sure you want to close the statements ?"
-msgstr ""
+msgstr "Вы уверены, что хотите закрыть проводки?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
-msgstr "Просмотреть результат"
+msgstr "Сканировать продукт"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -98,50 +103,52 @@ msgstr "Просмотреть результат"
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
-msgstr "Добавить платеж"
+msgstr "Добавить платеж:"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "Мои продажи"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 msgid "Box Out"
-msgstr ""
+msgstr "Выдвинуть ящик"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr ""
+msgstr "Продажи текущего пользователя за день"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Сумма"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "НДС"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Источник"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Налог"
 
@@ -154,15 +161,18 @@ msgstr "Итоговая транзакция"
 #: help:account.journal,special_journal:0
 msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
+"Установит все заявки в состояние ожидания до тех пор, пока они не будут "
+"приняты."
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
-msgstr "Партнер"
+msgstr "Контрагент"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Итоги дня"
 
@@ -170,97 +180,103 @@ msgstr "Итоги дня"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средняя цена"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Скидка (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Всего скидка"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Состояние"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
 msgid "Add payment"
-msgstr ""
+msgstr "Добавить платёж"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Продажи за месяц"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 msgid "Sales by User"
-msgstr ""
+msgstr "Продажи пользователя"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 #: report:pos.payment.report:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Скидка (%)"
 
 #. module: point_of_sale
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Ссылка"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Итоговая цена"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Разное"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr ""
+msgstr "Отчет о продажах"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
 #, python-format
 msgid "No Order Lines"
-msgstr ""
+msgstr "Отсутствуют строки заказа"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Прочая информация"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Product Type"
-msgstr ""
+msgstr "Тип продукции"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Даты"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
 msgid "Max Discount(%)"
-msgstr ""
+msgstr "Макс. скидка (%)"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
@@ -268,10 +284,11 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
-msgstr ""
+msgstr "Не найдено действительной строки прайс-листа!"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -281,13 +298,13 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
 #: field:report.sales.by.margin.pos.month,total:0
 msgid "Margin"
-msgstr ""
+msgstr "Маржа"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -302,7 +319,7 @@ msgstr "Общее кол-во"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Продажи пользователя за месяц"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -311,27 +328,29 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"Невозможно открыть кассовый ящик для \"%s\".\n"
+"Требуется закрыть связанный с ним регистр."
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
 msgid "User who is logged into the system."
-msgstr ""
+msgstr "Пользователь, зарегистрированный в системе."
 
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Product for Input"
-msgstr ""
+msgstr "Вводимый продкукт"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Способ оплаты"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Операции за день"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -341,41 +360,42 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Are you sure you want to close your sales ?"
-msgstr ""
+msgstr "Вы уверены, что хотите закрыть продажи?"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr ""
+msgstr "Продажи пользователя за месяц"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Дата платежа"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Дата закрытия"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -383,15 +403,15 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
-msgstr "Обзор"
+msgstr "Сводка"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Quotations"
-msgstr ""
+msgstr "Предложения"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_payment:0
@@ -399,10 +419,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Количество"
 
@@ -414,12 +436,13 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Период"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Чистый итог:"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
@@ -429,12 +452,12 @@ msgstr "Описание позиции"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Коды"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Операция вывода"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -446,20 +469,23 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Печать отчёта"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
-msgstr "Цена за ед."
+msgstr "Цена единицы"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "Проверьте, что входящий счёт установлен в %s"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_add_product.py:56
@@ -469,7 +495,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "Добавить продукт"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -477,22 +503,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Книга"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Платеж"
 
@@ -521,8 +553,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Режим налогов"
 
@@ -555,8 +587,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Всего уплачено"
 
@@ -566,8 +598,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "кол-во продукции"
 
@@ -598,7 +630,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Подитог"
 
@@ -653,8 +686,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Итог продаж"
 
@@ -664,7 +696,7 @@ msgid "Sum of subtotals"
 msgstr "Сумма подитогов"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Дата оплаты"
 
@@ -684,6 +716,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "Кассовый терминал "
@@ -696,7 +732,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +744,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Неверное действие !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Каталог"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Сумма счета"
 
@@ -755,7 +792,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Черновик счета"
 
@@ -805,7 +842,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +857,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "неизвестен"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Дата"
@@ -863,7 +900,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +922,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -939,7 +975,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Прочие"
 
@@ -967,19 +1003,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Цена"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "Кассовый терминал"
@@ -1029,7 +1068,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1091,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Нет прейскуранта!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Выберите открытый заказ"
 
@@ -1068,7 +1109,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Основной"
 
@@ -1084,18 +1125,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Примечания"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Заказ"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Налоги"
@@ -1103,12 +1143,13 @@ msgstr "Налоги"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Продать очередь"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Код"
 
@@ -1141,7 +1182,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Факс :"
 
@@ -1182,8 +1223,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Кол-во"
 
@@ -1201,8 +1248,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1384,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1395,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Оплачено"
 
@@ -1357,7 +1414,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1450,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Чек"
 
@@ -1400,15 +1461,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Выполнено"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Счет"
 
@@ -1425,7 +1486,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ссылка на заказ"
 
@@ -1459,7 +1519,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Налоги:"
 
@@ -1469,9 +1529,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Продукция"
 
@@ -1552,8 +1620,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Всего"
 
@@ -1597,12 +1670,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Дата выставления счета"
 
@@ -1651,29 +1738,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Действителен до"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Магазин"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1801,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Просмотреть штрих-код"
 
@@ -1746,8 +1832,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -1767,18 +1854,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Счета поставщиков"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1895,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Настройки"
 
@@ -1871,23 +1958,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Точка продаж"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Менеджер продаж"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Выставлен счет"
 
@@ -1904,12 +2000,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Черновик"
 
@@ -1929,12 +2026,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Проформа"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2049,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Продажи по пользователям"
 
@@ -1986,7 +2095,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2112,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Возвраты"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Пожалуйста, выставите счет счет для этой продажи."
@@ -2027,7 +2142,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Закрыть"
 
@@ -2079,11 +2203,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Описание"
 
@@ -2177,12 +2301,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Платежи"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index f0d246e826e..04dd69f60d1 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Uveljavi popust"
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Dodaj proizvod:"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Podrobnosti prodaje"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Skeniraj proizvod"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Dodaj plačilo:"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Znesek"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "DDV ID"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Davek"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Dnevni izkupiček"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Pop. (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Popust skupaj"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stanje"
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Datum plačila"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Skupaj (brez davkov):"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Cena enote"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel.:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Plačilo"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Način obdavčenja"
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Skupaj plačano"
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Količina"
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Delna vsota"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Skupaj prodaja"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Seštevek delnih zneskov"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Datum plačila"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Skupaj:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Nepravilno dejanje!"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cenik"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Skupaj zaračunano"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Osnutek računa"
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "DDV:"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "neznano"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Datum"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr "Številka transakcije"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Ostalo"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Cena"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Črtna koda"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Dobropis dobavitelja"
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ni cenika!"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Izberi odprt prodajni nalog"
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Osnova"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Opombe"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Prodajni nalog"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Davki"
@@ -1103,12 +1139,13 @@ msgstr "Davki"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Postavka prodaje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Oznaka"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Faks:"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Kol."
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Napaka!"
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Plačano"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Skupaj:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Prejemek"
 
@@ -1400,15 +1457,15 @@ msgstr "Ustvari račun"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Opravljeno"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Račun"
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Sklic naloga"
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Davek:"
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Skupaj"
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Družba"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Datum računa"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Število izdelkov"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Veljavnost"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Prevzemi"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Trgovina"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Izbira zadnjega izhoda"
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Preberi črtno kodo"
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Potrdi"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Račun dobavitelja"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Ime plačila"
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Konfiguracija"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Prodajno mesto"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Prodajalec"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Zaračunano"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Dodaj"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Osnutek"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Uporabnik"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Prodaja po uporabnikih"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Napaka"
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Dobropis"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Zapri"
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Opis"
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Plačila"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Datum izpisa"
 
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index 072137798d9..5555ef9227e 100644
--- a/addons/point_of_sale/i18n/sq.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1104,12 +1140,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1401,15 +1458,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index d3246cf3262..7b8b565f3ae 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-21 16:06+0000\n"
+"PO-Revision-Date: 2011-07-23 03:07+0000\n"
 "Last-Translator: qdp (OpenERP) \n"
 "Language-Team: Serbian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr "POS Potvrda"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Prihvati Popust"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr "Danas"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Dodaj proizvod :"
 
@@ -80,6 +81,8 @@ msgstr "Analiza Registara"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalji Prodaje"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Jeste li sigurni da zelite da zatvorite stavke ?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Skeniraj proizvod"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr "Dan"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Dodaj Placanje :"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr "Danasnja prodaja po datom korisniku"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "PDV"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Porez"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Ovo ce postaviti sve naloge na status cekanja sve dok se ne odobre"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Dnevni pazar"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr "Srednja Cena"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Popust (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Popust Ukupno"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stanje"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "NIje pronadjen odgovarajuci cenovnik"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr "Mesecna prodaja po korisniku"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Datum Isplate"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr "Za Proracun"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Sumarno"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr "Kasnjenje Placanja"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr "Razdoblje"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Neto Ukupno"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr "Stampa Izvestaja"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Cena komada"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr "Iznos Fakture"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel.:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Isplata"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr "Ne mozete brisati POS koji je zatvoren ili sadrzi potvrdjene Kase!"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Vrste Poreza"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr "Prodaja Ukupno ( pregled)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Ukupno placanje"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr "Detalji Provere"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Kol.proizvoda"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr "Ime Ul."
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Ukupna Prodaja"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "Suma Subtotala"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Datum Isplate"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr "Danasnje Prodaje"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr "Ukupno:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Neuspesno Kreiranje linije"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr "Ime Proizvoda"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Nedozvoljena Akcija !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cenovnik"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Ukupno fakturisano"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Danasnje zatvorene Kase"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Fakture u Pripremi"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr "Popust."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "PDV :"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr "Racun :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nepoznato"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Datum"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr "Sadrzaj POS Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Ne mozes izmeniti ovu fakturu, vec je placena"
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Broj Transakcija"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr "Ime"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Drugo"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr "Korisnici"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Cena"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Bar-Kod"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr "Sve zatvorene Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nema Cenovnika !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Odaberi otvoreni prodajni nalog"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr "Datum Narudzbe"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Osnova"
 
@@ -1085,18 +1122,17 @@ msgstr "Menadzer Prodaje"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Napomene"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Nalog za prodaju"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Porezi"
@@ -1104,12 +1140,13 @@ msgstr "Porezi"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Linija prodaje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Šifra"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr "Posebne Informacije"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Faks:"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr "Izborna Lista"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Kol."
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr "Prodaja po Korisniku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr "Napomena Musterije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nema narudzbenica definisanih za ovu prodaju."
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr "Stanje pri otvaranju"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Plaćeni"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr "Upit"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Ukupno:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr "Rbr Fakture"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Racun"
 
@@ -1401,15 +1458,15 @@ msgstr "Kreiraj Fakturu"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Gotovo"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -1426,7 +1483,6 @@ msgstr "Otvori"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Veze naloga"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr "Prodaja po marzi Korisnika"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Porezi:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "POS Statistika"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr "Pocetni datum"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Ukupno"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr "Stavke Povrata"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Preduzeće"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Datum Fakture"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr "Greska !"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Br.Artikala"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Rok Vazenja"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Biranje"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Prodavnica"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Izlaz zadnjeg biranja"
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr "Refundirana kolicina"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Skeniraj Bar-Kod"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr "Otkazana Faktura"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Potvrdi"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr "Popust "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Neuspesno modifikovanje linije !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Naziv Isplate"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Podešavanje"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr "Poruka"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Mesto Prodaje"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Prodavac"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Fakturisani"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr "Napomena Popusta"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Dodaj"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Priprema"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr "Izvestaj POS Placanja u odnosu na Datum"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Molim postavi partnera za prodaju"
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr "Kasir"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Корисник"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Prodaje po korisniku"
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr "Linije POS ZAhteva"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Greska"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr "Dnevnik Prodaje"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Refundiraj"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "MOlim kreiraj Fakturu za ovu prodaju"
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr "popust(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Zatvori"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr "molim proveri da li je dati nalog postavljen na %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Opis"
 
@@ -2180,12 +2300,21 @@ msgid "April"
 msgstr "April"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Placanja"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Datum Stampe"
 
@@ -2464,6 +2593,9 @@ msgstr "Godina"
 #~ msgid "Error: Invalid Bvr Number (wrong checksum)."
 #~ msgstr "Greska: Neispravan Bvr Borj ( pogresan cheksum)"
 
+#~ msgid "Product for expenses"
+#~ msgstr "Proizvodi za Troskove"
+
 #~ msgid "Bancontact Journal"
 #~ msgstr "Dnevnik kontakata Banke"
 
diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po
index 250c8ee3580..4c4ec800d36 100644
--- a/addons/point_of_sale/i18n/sr@latin.po
+++ b/addons/point_of_sale/i18n/sr@latin.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-12-23 16:16+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-07-23 03:01+0000\n"
+"Last-Translator: Raphael Collet (OpenERP) \n"
 "Language-Team: Serbian latin \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr "POS Potvrda"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Prihvati Popust"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr "Danas"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Dodaj proizvod :"
 
@@ -80,6 +81,8 @@ msgstr "Analiza Registara"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalji Prodaje"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "Jeste li sigurni da zelite da zatvorite stavke ?"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Skeniraj proizvod"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr "Dan"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Dodaj Placanje :"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr "Danasnja prodaja po datom korisniku"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Iznos"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "PDV"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Porez"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Ovo ce postaviti sve naloge na status cekanja sve dok se ne odobre"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Dnevni pazar"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr "Srednja Cena"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Popust (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Popust Ukupno"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Stanje"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "NIje pronadjen odgovarajuci cenovnik"
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr "Mesecna prodaja po korisniku"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Datum Isplate"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr "Za Proracun"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Sumarno"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr "Kasnjenje Placanja"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Količina"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr "Razdoblje"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Neto Ukupno"
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr "Stampa Izvestaja"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Cena komada"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr "Iznos Fakture"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel.:"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Isplata"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr "Ne mozete brisati POS koji je zatvoren ili sadrzi potvrdjene Kase!"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Vrste Poreza"
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr "Prodaja Ukupno ( pregled)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Ukupno placanje"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr "Detalji Provere"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Kol.proizvoda"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Subtotal"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr "Ime Ul."
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Ukupna Prodaja"
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr "Suma Subtotala"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Datum Isplate"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr "Danasnje Prodaje"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr "Ukupno:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "Neuspesno Kreiranje linije"
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr "Ime Proizvoda"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Nedozvoljena Akcija !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Cenovnik"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Ukupno fakturisano"
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Danasnje zatvorene Kase"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Fakture u Pripremi"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr "Popust."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "PDV :"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr "Racun :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "nepoznato"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Datum"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr "Sadrzaj POS Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Ne mozes izmeniti ovu fakturu, vec je placena"
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Broj Transakcija"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr "Ime"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Drugo"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr "Korisnici"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Cena"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Bar-Kod"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr "Sve zatvorene Kase"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Nema Cenovnika !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Odaberi otvoreni prodajni nalog"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr "Datum Narudzbe"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Osnova"
 
@@ -1085,18 +1122,17 @@ msgstr "Menadzer Prodaje"
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Napomene"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Nalog za prodaju"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Porezi"
@@ -1104,12 +1140,13 @@ msgstr "Porezi"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Linija prodaje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Šifra"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr "Posebne Informacije"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Faks:"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr "Izborna Lista"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Kol."
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr "Prodaja po Korisniku"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Greska !"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr "Napomena Musterije"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Nema narudzbenica definisanih za ovu prodaju."
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr "Stanje pri otvaranju"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Plaćeni"
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr "Upit"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Ukupno:"
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr "Rbr Fakture"
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Racun"
 
@@ -1401,15 +1458,15 @@ msgstr "Kreiraj Fakturu"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Gotovo"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -1426,7 +1483,6 @@ msgstr "Otvori"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Veze naloga"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr "Prodaja po marzi Korisnika"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Porezi:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr "POS Statistika"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr "Pocetni datum"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Ukupno"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr "Stavke Povrata"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Preduzeće"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Datum Fakture"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr "Greska !"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Br.Artikala"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr "Rok Vazenja"
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Biranje"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Prodavnica"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr "Izlaz zadnjeg biranja"
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr "Refundirana kolicina"
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Skeniraj Bar-Kod"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr "Otkazana Faktura"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Potvrdi"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr "Popust "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Faktura Dobavljaca"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "Neuspesno modifikovanje linije !"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Naziv Isplate"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Podešavanje"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr "Poruka"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Mesto Prodaje"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Prodavac"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Fakturisani"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr "Napomena Popusta"
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Dodaj"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Priprema"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr "Izvestaj POS Placanja u odnosu na Datum"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "Predračun"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Molim postavi partnera za prodaju"
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr "Kasir"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Корисник"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Prodaje po korisniku"
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr "Linije POS ZAhteva"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Greska"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr "Dnevnik Prodaje"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Refundiraj"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "MOlim kreiraj Fakturu za ovu prodaju"
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr "popust(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Zatvori"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr "molim proveri da li je dati nalog postavljen na %s"
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Opis"
 
@@ -2180,12 +2300,21 @@ msgid "April"
 msgstr "April"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Placanja"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Datum Stampe"
 
@@ -2285,6 +2414,9 @@ msgstr "Godina"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
+#~ msgid "Product for expenses"
+#~ msgstr "Proizvodi za Troskove"
+
 #~ msgid "Bancontact Journal"
 #~ msgstr "Dnevnik kontakata Banke"
 
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 2fd7656fa66..c989a0a141b 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr "Idag"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Lägg till produkt:"
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Försäljningsdetaljer"
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Skanna produkt"
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr "Dag"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Lägg till betalning:"
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr "Dagens försäljning av aktuell användare"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Belopp"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "Moms"
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Skatt"
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Detta lägger ordrarna i väntande status tills de blir accepterade"
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Totalt för dagen"
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr "Snittpris"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Rabatt (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Totala rabatter"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr "Kassaregister administration"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr "Månadsförsäljning per användare"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Betaldatum"
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Summering"
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Antal"
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr "Period"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr "Nettototal:"
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr "Skriv ut rapport"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Enhetspris"
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr "Fakturabelopp"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Journal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Betalning"
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Antal produkter"
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Deltotal"
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total försäljning"
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr "Summering av deltotaler"
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Betaldatum"
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr "Dagens försäljning"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr "Totalt :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr "Produktnamn"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Prislista"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Totalt fakturerat"
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Preliminär faktura"
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr "Rab."
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "Moms:"
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr "Kvitto :"
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "okänd"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Datum"
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "Du kan inte ändra denna order. Den är redan betald"
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr "Antal transkationer"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr "Förnamn"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Övrigt"
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr "Användare"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Pris"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Streckkod"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "Journalnamnet måste vara unikt per företag!"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Återbetalning till leverantör"
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Ingen prislista !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "Välj en öppen säljorder"
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr "Orderdaturm"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Bas"
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Anteckningar"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Försäljningsorder"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Moms"
@@ -1103,12 +1139,13 @@ msgstr "Moms"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Kod"
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr "Extra Info"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr "Plocklista"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "Ant"
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Fel !"
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr "Kundnotering"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr "Ingående saldo"
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Betald"
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr "Offert"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr "Totalt:"
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr "Kvitto"
 
@@ -1400,15 +1457,15 @@ msgstr "Skapa faktura"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Klar"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -1425,7 +1482,6 @@ msgstr "Öppna"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Orderreferens"
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Moms:"
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr "Startdatum"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Totalt"
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Företag"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Fakturadatum"
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr "Fel!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Plockning"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Affär"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Skanna streckkod"
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr "Avbrutna fakturor"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr "Rabatt "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Leverantörsfaktura"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "Journalkoden måste vara unik per företag!"
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr "Meddelande"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Säljare"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Fakturerad"
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Lägg till"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Utkast"
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Vänligen välj en kund för försäljningen"
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr "Kassör"
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Användare"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr "Försäljning per användare"
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Fel"
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr "Försäljningsjournal"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Återbetalning"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Vänligen skapa en faktura för denna försäljning"
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr "Rab(%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Stäng"
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr "April"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Betalningar"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Utskriftsdatum"
 
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index e2bfba37d81..3bb34b4f496 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 683103d47e6..decda4ee268 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/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: 2011-05-15 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -283,8 +283,8 @@ msgid "Cash register management"
 msgstr "Kasa Kaydı Yönetimi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "Geçerli bir fiyat listesi satırı bulunamadı !"
@@ -620,8 +620,8 @@ msgid "User's Product"
 msgstr "Kullanıcının Ürünleri"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1043
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -733,7 +733,7 @@ msgid "Total :"
 msgstr "Toplam :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -1092,8 +1092,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1249,9 +1249,9 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:558
-#: code:addons/point_of_sale/point_of_sale.py:744
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
@@ -1284,7 +1284,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:544
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1385,7 +1385,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1594,7 +1594,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:743
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1695,8 +1695,8 @@ msgid "Invoice Date"
 msgstr "Fatura Tarihi"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1058
-#: code:addons/point_of_sale/point_of_sale.py:1077
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1714,7 +1714,7 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:555
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
@@ -1860,7 +1860,7 @@ msgid "Supplier Invoice"
 msgstr "Tedarikçi Faturası"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1210
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1912,8 +1912,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:507
-#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -2032,13 +2032,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:853
+#: code:addons/point_of_sale/point_of_sale.py:852
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2096,13 +2096,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:340
-#: code:addons/point_of_sale/point_of_sale.py:507
-#: code:addons/point_of_sale/point_of_sale.py:509
-#: code:addons/point_of_sale/point_of_sale.py:547
-#: code:addons/point_of_sale/point_of_sale.py:638
-#: code:addons/point_of_sale/point_of_sale.py:1202
-#: code:addons/point_of_sale/point_of_sale.py:1210
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index c0c1dbe6bcd..ff38dbf9842 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Інвойс"
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Налаштування"
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index d67353905fd..00f64bbf9c1 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr "Xác nhận của Điểm bán hàng"
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr "Áp dụng chiết khấu"
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr "Hôm nay"
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "Thêm sản phẩm :"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Chi tiết bán hàng"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "Quét sản phẩm"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr "Ngày"
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr "Thêm thanh toán :"
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Số tiền"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "Thuế GTGT"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr "Gốc"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "Thuế"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr "Đối tác"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Tổng trong ngày"
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr "Giá TB"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Chiết khấu (%)"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr "Tổng chiết khấu"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Tình trạng"
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr "Doanh số hàng tháng theo người dùng"
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr "Ngày thanh toán"
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr "Tóm tắt"
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr "Hoãn thanh toán"
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Số lượng"
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr "Chu kỳ"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr "In Báo cáo"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Đơn giá"
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr "Giá trị trên hóa đơn"
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr "Sổ nhật ký"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr "ĐT :"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Thanh toán"
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -548,7 +576,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.add.product:0
 msgid "Save & New"
-msgstr "Ghi & Tạo mới"
+msgstr "Lưu & Tạo mới"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "Tổng số đã trả"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr "Kiểm tra các chi tiết"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Số lượng sản phẩm"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "Tổng phụ"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr "Ngày thanh toán"
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr "Doanh số hôm nay"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "POS "
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr "Tổng :"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr "Tên sản phẩm"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr "Hành động không hợp lệ !"
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Bảng giá"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Hóa đơn dự thảo"
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr "Chiết khấu"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr "Thuế GTGT :"
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "chưa rõ"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Ngày"
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr "Số lượng giao dịch"
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr "Tên"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr "Khác"
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr "Giá"
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr "Mã vạch"
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "POS"
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Hoàn tiền cho Nhà cung cấp"
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "Không có bảng giá !"
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr "Ngày đặt hàng"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "Cơ sở"
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Các ghi chú"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr "Đơn hàng"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Các loại thuế"
@@ -1104,12 +1140,13 @@ msgstr "Các loại thuế"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr "Mã"
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr "Thông tin bổ sung"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr "SL"
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr "Lỗi !"
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1401,15 +1458,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Hoàn tất"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Hóa đơn"
 
@@ -1426,7 +1483,6 @@ msgstr "Mở"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Tham chiếu đơn hàng"
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr "Các loại thuế:"
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Sản phẩm"
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr "Ngày bắt đầu"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Tổng số"
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr "Công ty"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Ngày hóa đơn"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr "Lỗi!"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Cửa hàng"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr "Quét mã vạch"
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr "Hóa đơn đã bị hủy bỏ"
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr "Xác nhận"
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr "Chiết khấu "
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Hóa đơn Nhà cung cấp"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr "Tên thanh toán"
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr "Cấu hình"
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr "Thông điệp"
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Điểm bán hàng"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr "Nhân viên bán hàng"
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Đã được hóa đơn"
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr "Thêm"
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr "Dự thảo"
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "Lỗi"
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr "Hoàn tiền"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr "Chiết khấu (%)"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr "Đóng"
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr "Mô tả"
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr "Tháng Tư"
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr "Các thanh toán"
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr "Ngày In"
 
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 45535da24dc..2c3be8c9beb 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/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: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -119,7 +119,7 @@ msgstr "我的销售订单"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 msgid "Box Out"
-msgstr ""
+msgstr "开箱"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
@@ -282,8 +282,8 @@ msgid "Cash register management"
 msgstr "现金登记管理"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1057
-#: code:addons/point_of_sale/point_of_sale.py:1076
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "没找到有效的价格表明细。"
@@ -348,7 +348,7 @@ msgstr "支付方式"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr "日常操作"
+msgstr "每天经营"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -429,7 +429,7 @@ msgstr "数量"
 #. module: point_of_sale
 #: help:account.journal,auto_cash:0
 msgid "This field authorize the automatic creation of the cashbox"
-msgstr ""
+msgstr "这字段授权自动建立钱箱"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -455,7 +455,7 @@ msgstr "编码"
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "上缴"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -535,7 +535,7 @@ msgstr "期末结余"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products for Output Operations"
-msgstr ""
+msgstr "产品出货"
 
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
@@ -619,8 +619,8 @@ msgid "User's Product"
 msgstr "用户的产品"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1043
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -678,7 +678,7 @@ msgstr "已接受的销售订单"
 #: help:account.journal,check_dtls:0
 msgid ""
 "This field authorize Validation of Cashbox without checking ending details"
-msgstr ""
+msgstr "这字段授权校验钱箱不检查最终细节"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -732,7 +732,7 @@ msgid "Total :"
 msgstr "合计:"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1202
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr "明细创建失败！"
@@ -897,7 +897,7 @@ msgstr "UserError "
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -951,7 +951,7 @@ msgstr "信息"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Input Operations"
-msgstr "输入操作"
+msgstr "存备用金"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_cash_register
@@ -1031,7 +1031,7 @@ msgstr "创建日期"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Output Operations"
-msgstr "输出操作"
+msgstr "上缴"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1091,8 +1091,8 @@ msgid "All Closed CashBox"
 msgstr "所有关闭的钱箱"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1042
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr "没有价格表！"
@@ -1189,7 +1189,7 @@ msgstr "传真:"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "有关销售员"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1258,9 +1258,9 @@ msgid "Sale by User"
 msgstr "用户的销售订单"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:558
-#: code:addons/point_of_sale/point_of_sale.py:744
-#: code:addons/point_of_sale/point_of_sale.py:852
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:107
@@ -1293,7 +1293,7 @@ msgid "July"
 msgstr "7月"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:547
+#: code:addons/point_of_sale/point_of_sale.py:544
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr "请为产品%s提供一个科目"
@@ -1338,7 +1338,7 @@ msgstr "没有发现有效的ID"
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
 msgid "Is accompte"
-msgstr ""
+msgstr "付款"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1394,7 +1394,7 @@ msgid "Customer Note"
 msgstr "客户备注"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:340
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "订单没有订单明细"
@@ -1486,7 +1486,7 @@ msgstr "发票"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
 msgid "Get From Sale"
-msgstr ""
+msgstr "出售"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1509,7 +1509,7 @@ msgstr "销售明细报表"
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: view:pos.box.entries:0
 msgid "Box Entries"
-msgstr ""
+msgstr "钱箱"
 
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
@@ -1603,7 +1603,7 @@ msgid "Yes"
 msgstr "是"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:744
+#: code:addons/point_of_sale/point_of_sale.py:743
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)"
@@ -1704,8 +1704,8 @@ msgid "Invoice Date"
 msgstr "发票日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1058
-#: code:addons/point_of_sale/point_of_sale.py:1077
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
@@ -1725,7 +1725,7 @@ msgid "Reprint"
 msgstr "重新打印"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:558
+#: code:addons/point_of_sale/point_of_sale.py:555
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:103
 #: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
@@ -1821,7 +1821,7 @@ msgstr "扫描条码"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr "操作"
+msgstr "经营"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
@@ -1871,7 +1871,7 @@ msgid "Supplier Invoice"
 msgstr "供应商发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1210
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr "明细修改失败！"
@@ -1889,7 +1889,7 @@ msgstr "报表"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products for Input Operations"
-msgstr ""
+msgstr "产品进货"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
@@ -1899,7 +1899,7 @@ msgstr "当前用户今日销售订单"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "pos上缴"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
@@ -1923,8 +1923,8 @@ msgid "Validation Date"
 msgstr "审核日期"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:507
-#: code:addons/point_of_sale/point_of_sale.py:509
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr "你没有权限审核此销售订单！"
@@ -1960,7 +1960,7 @@ msgstr "销售明细"
 #. module: point_of_sale
 #: field:product.product,am_out:0
 msgid "Control for Output Operations"
-msgstr ""
+msgstr "出货控制"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
@@ -2043,13 +2043,13 @@ msgid "PRO-FORMA"
 msgstr "形式发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:638
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "请提供业务伙伴。"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:853
+#: code:addons/point_of_sale/point_of_sale.py:852
 #, python-format
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
@@ -2107,13 +2107,13 @@ msgid "POS Orders lines"
 msgstr "POS订单明细"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:340
-#: code:addons/point_of_sale/point_of_sale.py:507
-#: code:addons/point_of_sale/point_of_sale.py:509
-#: code:addons/point_of_sale/point_of_sale.py:547
-#: code:addons/point_of_sale/point_of_sale.py:638
-#: code:addons/point_of_sale/point_of_sale.py:1202
-#: code:addons/point_of_sale/point_of_sale.py:1210
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr "错误"
@@ -2206,7 +2206,7 @@ msgstr "今日用户销售情况"
 #: view:pos.box.entries:0
 #: view:pos.box.out:0
 msgid "Please fill these fields for entries to the box:"
-msgstr ""
+msgstr "请填充这些钱箱的字段"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:99
@@ -2557,3 +2557,6 @@ msgstr "年"
 
 #~ msgid "OPERATION N° :"
 #~ msgstr "操作员:"
+
+#~ msgid "Product for expenses"
+#~ msgstr "产品费用"
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index cbe4d6e10f6..df15241ca9f 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -33,7 +33,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -58,7 +59,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr "新加產品"
 
@@ -80,6 +81,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "詳細銷售資料"
 
@@ -89,7 +92,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr "掃描產品"
 
@@ -102,7 +107,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -123,16 +128,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "金額"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr "增值稅"
 
@@ -142,7 +149,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr "稅項"
 
@@ -157,13 +164,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -174,19 +182,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -269,7 +283,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -362,7 +377,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -384,8 +400,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -400,10 +416,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -418,7 +436,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -450,9 +469,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -478,22 +500,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -522,8 +550,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -556,8 +584,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr "總已付"
 
@@ -567,8 +595,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr "產品數量"
 
@@ -599,7 +627,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr "小計"
 
@@ -654,8 +683,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -665,7 +693,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -685,6 +713,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -697,7 +729,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -709,19 +741,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -756,7 +789,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -806,7 +839,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -821,13 +854,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -864,7 +897,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -886,15 +919,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -940,7 +972,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -968,19 +1000,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1030,7 +1065,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1053,13 +1088,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr "選擇未關銷售訂單"
 
@@ -1069,7 +1106,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr "基本"
 
@@ -1085,18 +1122,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr "記事"
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "稅項"
@@ -1104,12 +1140,13 @@ msgstr "稅項"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1142,7 +1179,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1183,8 +1220,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1202,8 +1245,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1331,7 +1381,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1342,7 +1392,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1358,7 +1411,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1390,7 +1447,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1401,15 +1458,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1426,7 +1483,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1460,7 +1516,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1470,9 +1526,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1553,8 +1617,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1598,12 +1667,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr "發票日期"
 
@@ -1652,29 +1735,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "店鋪"
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1716,7 +1798,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1747,8 +1829,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1768,18 +1851,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1809,7 +1892,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1872,23 +1955,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1905,12 +1997,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1930,12 +2023,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1953,14 +2046,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1987,7 +2092,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1998,12 +2109,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2028,7 +2139,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2080,11 +2200,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2178,12 +2298,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index e4f64e6fb10..32e4bb10289 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:57+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -32,7 +32,8 @@ msgid "Point of Sale Confirm"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.discount,init,apply_discount:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
 msgid "Apply Discount"
 msgstr ""
 
@@ -57,7 +58,7 @@ msgid "Today"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.add_product,init:0
+#: view:pos.add.product:0
 msgid "Add product :"
 msgstr ""
 
@@ -79,6 +80,8 @@ msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr ""
 
@@ -88,7 +91,9 @@ msgid "Are you sure you want to close the statements ?"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
+#: model:ir.model,name:point_of_sale.model_pos_scan_product
+#: view:pos.scan.product:0
 msgid "Scan product"
 msgstr ""
 
@@ -101,7 +106,7 @@ msgid "Day"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.payment,ask_pay:0
+#: view:pos.make.payment:0
 msgid "Add payment :"
 msgstr ""
 
@@ -122,16 +127,18 @@ msgid "Today's Sales By Current User"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: field:pos.payment,amount:0
-#: wizard_field:pos.payment,ask_pay,amount:0
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "VAT"
 msgstr ""
 
@@ -141,7 +148,7 @@ msgid "Origin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tax"
 msgstr ""
 
@@ -156,13 +163,14 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,partner_id:0
+#: report:account.statement:0
+#: field:report.pos.order,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total of the day"
 msgstr ""
 
@@ -173,19 +181,25 @@ msgid "Average Price"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "Disc. (%)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total discount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
 #: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.cash.register,state:0
+#: field:report.pos.order,state:0
 msgid "State"
 msgstr ""
 
@@ -268,7 +282,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -361,7 +376,8 @@ msgid "Sales by User Monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.payment,payment_date:0
+#: field:pos.order,date_payment:0
+#: field:report.pos.order,date_payment:0
 msgid "Payment Date"
 msgstr ""
 
@@ -383,8 +399,8 @@ msgid "To count"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Summary"
 msgstr ""
 
@@ -399,10 +415,12 @@ msgid "Delay Payment"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,quantity:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: field:pos.add.product,quantity:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr ""
 
@@ -417,7 +435,8 @@ msgid "Period"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: report:pos.payment.report:0
 msgid "Net Total:"
 msgstr ""
 
@@ -449,9 +468,12 @@ msgid "Print Report"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 #: field:pos.order.line,price_unit:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr ""
 
@@ -477,22 +499,28 @@ msgid "Invoice Amount"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: wizard_field:pos.payment,ask_pay,journal:0
-#: field:pos.payment,journal_id:0
-#: field:report.transaction.pos,journal_id:0
+#: view:report.cash.register:0
+#: field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
 msgid "Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Tel. :"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr ""
 
@@ -521,8 +549,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr ""
 
@@ -555,8 +583,8 @@ msgid "Sales total(Revenue)"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total paid"
 msgstr ""
 
@@ -566,8 +594,8 @@ msgid "Check Details"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Qty of product"
 msgstr ""
 
@@ -598,7 +626,8 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order.line,price_subtotal:0
+#: view:pos.order:0
+#: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
 msgstr ""
 
@@ -653,8 +682,7 @@ msgid "St.Name"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details_summary:0
 msgid "Sales total"
 msgstr ""
 
@@ -664,7 +692,7 @@ msgid "Sum of subtotals"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_date:0
+#: field:pos.make.payment,payment_date:0
 msgid "Payment date"
 msgstr ""
 
@@ -684,6 +712,10 @@ msgid "Today's Sales"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr ""
@@ -696,7 +728,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -708,19 +740,20 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
 msgid "Total invoiced"
 msgstr ""
 
@@ -755,7 +788,7 @@ msgid "Today's Closed Cashbox"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Draft Invoice"
 msgstr ""
 
@@ -805,7 +838,7 @@ msgid "Disc."
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "VAT :"
 msgstr ""
 
@@ -820,13 +853,13 @@ msgid "Receipt :"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
+#: field:account.bank.statement.line,pos_statement_id:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr ""
@@ -863,7 +896,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -885,15 +918,14 @@ msgid "Number of Transaction"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.add_product,init,end:0
-#: wizard_button:pos.config.journal,init,end:0
-#: wizard_button:pos.discount,init,end:0
-#: view:pos.order:0
+#: view:pos.add.product:0
+#: view:pos.box.entries:0
+#: view:pos.box.out:0
+#: view:pos.get.sale:0
+#: view:pos.make.payment:0
 #: selection:pos.order,state:0
-#: wizard_button:pos.payment,ask_pay,end:0
-#: wizard_button:pos.refund_order,init,end:0
-#: wizard_button:pos.sale.get,init,end:0
-#: wizard_button:pos.scan_product,init,end:0
+#: view:pos.receipt:0
+#: selection:report.pos.order,state:0
 msgid "Cancel"
 msgstr ""
 
@@ -939,7 +971,7 @@ msgid "First Name"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:res.company:0
 msgid "Other"
 msgstr ""
 
@@ -967,19 +999,22 @@ msgid "Users"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Price"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.scan_product,init,gencod:0
+#: field:pos.scan.product,gencod:0
 msgid "Barcode"
 msgstr ""
 
 #. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr ""
@@ -1029,7 +1064,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
@@ -1052,13 +1087,15 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.sale.get,init:0
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
+#: view:pos.get.sale:0
 msgid "Select an Open Sale Order"
 msgstr ""
 
@@ -1068,7 +1105,7 @@ msgid "Order date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Base"
 msgstr ""
 
@@ -1084,18 +1121,17 @@ msgstr ""
 
 #. module: point_of_sale
 #: view:pos.order:0
-#: field:pos.order,note:0
 msgid "Notes"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.sale.get,init,picking_id:0
+#: field:pos.get.sale,picking_id:0
+#: view:pos.order:0
 msgid "Sale Order"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
+#: report:pos.invoice:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1103,12 +1139,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: rml:pos.details:0
+#: report:pos.details:0
 msgid "Code"
 msgstr ""
 
@@ -1141,7 +1178,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Fax :"
 msgstr ""
 
@@ -1182,8 +1219,14 @@ msgid "Picking List"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
+#: report:pos.details:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
 msgid "Qty"
 msgstr ""
 
@@ -1201,8 +1244,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1330,7 +1380,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1341,7 +1391,10 @@ msgid "Opening Balance"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr ""
 
@@ -1357,7 +1410,11 @@ msgid "Quotation"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
 msgid "Total:"
 msgstr ""
 
@@ -1389,7 +1446,7 @@ msgid "Nbr Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
 msgstr ""
 
@@ -1400,15 +1457,15 @@ msgstr ""
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
-#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
-#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr ""
 
@@ -1425,7 +1482,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
-#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr ""
 
@@ -1459,7 +1515,7 @@ msgid "Sales by User Margin"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -1469,9 +1525,17 @@ msgid "Point of Sale Orders Statistics"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.add_product,init,product:0
-#: rml:pos.details:0
+#: model:ir.model,name:point_of_sale.model_product_product
+#: field:pos.add.product,product_id:0
+#: report:pos.details:0
 #: field:pos.order.line,product_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:product.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr ""
 
@@ -1552,8 +1616,13 @@ msgid "Date Start"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user.today.current.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr ""
 
@@ -1597,12 +1666,26 @@ msgid "Return lines"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
 msgid "Company"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Invoice Date"
 msgstr ""
 
@@ -1651,29 +1734,28 @@ msgid "Error!"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.lines:0
 msgid "No. Of Articles"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
-#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr ""
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,last_out_picking:0
+#: field:pos.order,picking_id:0
 msgid "Last Output Picking"
 msgstr ""
 
@@ -1715,7 +1797,7 @@ msgid "Refunded Quantity"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_view:pos.scan_product,init:0
+#: view:pos.scan.product:0
 msgid "Scan Barcode"
 msgstr ""
 
@@ -1746,8 +1828,9 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
-#: wizard_button:pos.sale.get,init,set:0
+#: view:account.bank.statement:0
+#: view:pos.get.sale:0
+#: view:report.cash.register:0
 msgid "Confirm"
 msgstr ""
 
@@ -1767,18 +1850,18 @@ msgid "Discount "
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_field:pos.payment,ask_pay,payment_name:0
+#: field:pos.make.payment,payment_name:0
 msgid "Payment name"
 msgstr ""
 
@@ -1808,7 +1891,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
 msgid "Configuration"
 msgstr ""
 
@@ -1871,23 +1954,32 @@ msgid "Message"
 msgstr ""
 
 #. module: point_of_sale
+#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
-#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
+#: view:pos.order:0
+#: field:pos.payment.report.date,user_id:0
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
 msgid "Salesman"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.details:0
+#: report:pos.details:0
 #: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr ""
 
@@ -1904,12 +1996,13 @@ msgid "Discount Notice"
 msgstr ""
 
 #. module: point_of_sale
-#: wizard_button:pos.scan_product,init,add:0
+#: view:pos.scan.product:0
 msgid "Add"
 msgstr ""
 
 #. module: point_of_sale
-#: selection:pos.order,state:0
+#: view:report.cash.register:0
+#: selection:report.pos.order,state:0
 msgid "Draft"
 msgstr ""
 
@@ -1929,12 +2022,12 @@ msgid "POS Payment Report according to date"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
@@ -1952,14 +2045,26 @@ msgid "Cashier"
 msgstr ""
 
 #. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: view:pos.payment.report.date:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
+#: view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
 msgstr ""
 
@@ -1986,7 +2091,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1997,12 +2108,12 @@ msgid "Sales Journal"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
+#: report:pos.invoice:0
 msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2027,7 +2138,16 @@ msgid "Disc(%)"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: view:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.date:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+#: view:pos.sales.user.today:0
+#: view:pos.sales.user.today.current_user:0
+#: view:pos.scan.product:0
 msgid "Close"
 msgstr ""
 
@@ -2079,11 +2199,11 @@ msgid "please check that account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
+#: field:pos.box.entries,name:0
+#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: rml:pos.invoice:0
-#: rml:pos.lines:0
-#: field:pos.payment,name:0
-#: rml:pos.receipt:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
 msgid "Description"
 msgstr ""
 
@@ -2177,12 +2297,21 @@ msgid "April"
 msgstr ""
 
 #. module: point_of_sale
-#: view:pos.order:0
+#: field:pos.order,statement_ids:0
 msgid "Payments"
 msgstr ""
 
 #. module: point_of_sale
-#: rml:pos.lines:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report:0
+#: report:pos.payment.report.date:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.sales.user.today.current.user:0
+#: report:pos.user.product:0
 msgid "Print Date"
 msgstr ""
 
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 8634339bcd8..6fa5786727d 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 08:40+0000\n"
-"Last-Translator: Quentin THEURET \n"
+"PO-Revision-Date: 2011-07-23 19:17+0000\n"
+"Last-Translator: lolivier \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: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-24 04:34+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -28,7 +28,7 @@ msgstr ""
 "Inclure de nouveau la description de la tâche dans la tâche de l'utilisateur"
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr "La tâche '%s' a été déléguée à %s."
@@ -63,7 +63,7 @@ msgid "Deadlines"
 msgstr "Date limite"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Opération non permises !"
@@ -72,7 +72,7 @@ msgstr "Opération non permises !"
 #: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "Vérification : %s"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:55
@@ -255,7 +255,7 @@ msgid "Day"
 msgstr "Jour"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
 msgstr "La tâche '%s' est terminée"
@@ -326,7 +326,7 @@ msgstr "Pas une tâche modèle"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr "Tâche démarrée"
+msgstr "Démarrer la tâche"
 
 #. module: project
 #: help:project.installer,project_timesheet:0
@@ -451,7 +451,7 @@ msgid "Reactivate Project"
 msgstr "Ré-activer le projet"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tâche '%s' fermée"
@@ -460,7 +460,7 @@ msgstr "Tâche '%s' fermée"
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Compte Analytique"
+msgstr "Compte analytique"
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -501,8 +501,8 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -648,7 +648,7 @@ msgid "Reevaluate"
 msgstr "Réévaluer"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
 msgstr "Envoyer un courriel après avoir fermé la tâche"
@@ -743,7 +743,7 @@ msgid "Starting Date"
 msgstr "Démarrage du projet"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -772,7 +772,7 @@ msgstr ""
 "incident."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
 msgstr "La tâche '%s' est ouverte."
@@ -1196,7 +1196,6 @@ msgstr "Tableau de bord de projet"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Projet parent"
 
@@ -1226,7 +1225,7 @@ msgid "Customer Email"
 msgstr "Courriel client"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr "Le projet '%s' a été fermé."
@@ -1276,7 +1275,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Quand une tâche sera finie, elle passera à l'état terminé"
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr "Le projet '%s' a été ouvert."
@@ -1431,7 +1430,7 @@ msgstr ""
 "une tâche, etc."
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tâche '%s' mise \"en cours\""
@@ -1484,7 +1483,7 @@ msgid "Open"
 msgstr "Ouvert"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1824,7 +1823,7 @@ msgid "Spent Hours"
 msgstr "Heures consommées"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
 msgstr "La tâche '%s' est en attente."
@@ -1910,7 +1909,7 @@ msgid "Validation State"
 msgstr "État de Validation"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tâche '%s' annulée"
@@ -1940,7 +1939,7 @@ msgid "Create Date"
 msgstr "Date de création"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr "La tâche '%s' est annulée."
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 1d5d6ee293f..5c77e6a30fb 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -937,7 +937,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index 762dfef45fd..ce72e938659 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -79,7 +79,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -957,8 +957,14 @@ 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 "Purchase Lines Not Invoiced"
-msgstr "Редове от поръчката, които не са фактурирани"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1836,3 +1842,6 @@ msgstr ""
 
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "Активни заявки за покупка"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Редове от поръчката, които не са фактурирани"
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 172fb7fd779..d447b0abc7c 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,8 +69,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Iz zaprimanja"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -945,7 +945,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1824,6 +1830,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
 
+#~ msgid "From Picking"
+#~ msgstr "Iz zaprimanja"
+
 #~ msgid "Purchase Process"
 #~ msgstr "Proces nabavke"
 
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index cd974b250fd..195fedd1f21 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -85,8 +85,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Des de albarà"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1001,8 +1001,14 @@ msgstr "Per ser revisat pel comptable."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Línies de compra no facturades"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1939,6 +1945,9 @@ msgstr "Taulell de compres"
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Factura de proveïdor pre-generada en la recepció per a control"
 
+#~ msgid "From Picking"
+#~ msgstr "Des de albarà"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
@@ -2145,3 +2154,6 @@ msgstr "Taulell de compres"
 
 #~ msgid "Date"
 #~ msgstr "Data"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Línies de compra no facturades"
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index f67fe0d09cb..ad48bccef92 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-16 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
 "X-Generator: Launchpad (build 13405)\n"
 "X-Poedit-Language: Czech\n"
 
@@ -27,7 +27,7 @@ msgstr ""
 "potvrzenou nákupní objednávkou."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:292
+#: code:addons/purchase/purchase.py:282
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr "Nemůžete potvrdit nákupní objednávku bez řádků Nákupní objednávky."
@@ -45,7 +45,7 @@ msgid "Destination"
 msgstr "Cíl"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:721
+#: code:addons/purchase/purchase.py:710
 #, python-format
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
@@ -73,8 +73,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Z navádění"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -118,7 +118,7 @@ msgstr ""
 "sledovat obdržené výrobky a ovládat faktury dodavatelů."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:735
+#: code:addons/purchase/purchase.py:722
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr "Vybraný dodavatel prodává pouze tento výrobek po %s"
@@ -141,7 +141,7 @@ msgid "From a Pick list"
 msgstr "Ze seznamu navádění"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:660
+#: code:addons/purchase/purchase.py:649
 #, python-format
 msgid "No Pricelist !"
 msgstr "Žádný ceník !"
@@ -232,7 +232,7 @@ msgid "Partial Picking"
 msgstr "Částečné navádění"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:296
+#: code:addons/purchase/purchase.py:286
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr "Nákupní objednávka '%s' je potvrzena."
@@ -279,7 +279,7 @@ msgid "Notes"
 msgstr "Poznámky"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:660
+#: code:addons/purchase/purchase.py:649
 #, python-format
 msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
@@ -355,7 +355,7 @@ msgid "Cancelled"
 msgstr "Zrušeno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:315
+#: code:addons/purchase/purchase.py:305
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr "Částka nákupu je nad limitem"
@@ -409,7 +409,7 @@ msgid "Reference"
 msgstr "Odkaz"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:244
+#: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr "Nelze smazat Nákupní objednávku(y), která je ve stavu %s!"
@@ -431,7 +431,7 @@ msgid "Day"
 msgstr "Den"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:344
+#: code:addons/purchase/purchase.py:334
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr "Nákupní objednávka '%s' byla nasatavena do návrhového stavu."
@@ -448,8 +448,8 @@ msgid "# of Lines"
 msgstr "# z řádek"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:696
-#: code:addons/purchase/purchase.py:735
+#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:722
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
@@ -486,7 +486,7 @@ msgid "It indicates that a picking has been done"
 msgstr "Indikuje, že navádění bylo dokončeno"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:721
+#: code:addons/purchase/purchase.py:710
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr "Nesprávná MJ výrobku !"
@@ -588,7 +588,7 @@ msgid "Order Lines"
 msgstr "Řádky objednávky"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:662
+#: code:addons/purchase/purchase.py:651
 #, python-format
 msgid "No Partner!"
 msgstr "Žádný partner!"
@@ -637,9 +637,9 @@ msgid "Invoices generated for a purchase order"
 msgstr "Faktury generované pro nákupní objednávku"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:292
+#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:352
 #: code:addons/purchase/purchase.py:362
-#: code:addons/purchase/purchase.py:372
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
@@ -700,7 +700,7 @@ msgid "Reservation Destination"
 msgstr "Cíl rezervace"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:244
+#: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Invalid action !"
 msgstr "Neplatná akce !"
@@ -780,7 +780,7 @@ msgid "    Month-1    "
 msgstr "    Měsíc-1    "
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:373
+#: code:addons/purchase/purchase.py:363
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr "Pro tuto společnost není určen nákupní deník: \"%s\" (id:%d)"
@@ -791,7 +791,7 @@ msgid "Manual"
 msgstr "Ruční"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:410
+#: code:addons/purchase/purchase.py:400
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -908,6 +908,7 @@ msgid "Month"
 msgstr "Měsíc"
 
 #. module: purchase
+#: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
 msgstr "Čekání na potvrzení dodavatelem"
@@ -961,8 +962,14 @@ msgstr "K překontrolování účetním."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Nefakturované nákupní řádky"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1105,7 +1112,7 @@ msgid "Manual Invoices"
 msgstr "Ruční faktury"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:318
+#: code:addons/purchase/purchase.py:308
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
@@ -1122,14 +1129,14 @@ msgid "Extended Filters..."
 msgstr "Rozšířené filtry..."
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/purchase.py:352
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Pro tento výrobek nebyl definován nákladový účet: \"%s\" (id:%d)"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:418
+#: code:addons/purchase/purchase.py:408
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
@@ -1177,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:696
+#: code:addons/purchase/purchase.py:685
 #, python-format
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
@@ -1440,7 +1447,7 @@ msgid "Date Approved"
 msgstr "Datum schválení"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:417
+#: code:addons/purchase/purchase.py:407
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr "Nelze zrušit tuto nákupní objednávku !"
@@ -1552,7 +1559,7 @@ msgid "Total Qty and Amount by month"
 msgstr "Celkové množ. a částka za měsíc"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:409
+#: code:addons/purchase/purchase.py:399
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr "Nelze zrušit nákupní objednávku !"
@@ -1698,7 +1705,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:424
+#: code:addons/purchase/purchase.py:414
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr "Nákupní objednávka '%s' zrušena."
@@ -1778,7 +1785,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:662
+#: code:addons/purchase/purchase.py:651
 #, python-format
 msgid ""
 "You have to select a partner in the purchase form !\n"
@@ -1827,3 +1834,9 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
 msgstr "Nástěnka nákupu"
+
+#~ msgid "From Picking"
+#~ msgstr "Z navádění"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Nefakturované nákupní řádky"
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 82a21de7fd6..23136992873 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -85,8 +85,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Rechnung durch Lieferung"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1014,8 +1014,14 @@ msgstr "Zu erneuern durch den Finanzbuchhalter"
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Nicht berechnete Produktzugänge"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2278,6 +2284,9 @@ msgstr "Pinnwand Einkauf"
 #~ msgid "Rules are not supported for osv_memory objects !"
 #~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
 
+#~ msgid "From Picking"
+#~ msgstr "Rechnung durch Lieferung"
+
 #~ msgid ""
 #~ "If you set the invoicing control on a purchase order as \"Manual\", you can "
 #~ "track here all the purchase order lines for which you did not received the "
@@ -2291,3 +2300,14 @@ msgstr "Pinnwand Einkauf"
 #~ "Eingangsrechnung empfangen, können Sie auch eine Eingangsrechnung zunächst "
 #~ "im Status Entwurf auf Basis der Auftragspositionen über dieses Menü "
 #~ "erstellen."
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Nicht berechnete Produktzugänge"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a pricelist in the purchase form !\n"
+#~ "Please set one before choosing a product."
+#~ msgstr ""
+#~ "Sie müssen eine Preisliste im Einkaufsformular auswählen, bevor Sie ein "
+#~ "Produkt auswählen."
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index c6d1ced46c3..c87b3ff983d 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -74,8 +74,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Από Συλλογή"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -954,7 +954,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1821,6 +1827,9 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Τιμολόγιο Προμηθευτή προ-δημιουργημένο για έλεγχο κατά την παραλάβη"
 
+#~ msgid "From Picking"
+#~ msgstr "Από Συλλογή"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index f7efd865edf..47b5fa79292 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,7 +70,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -938,7 +938,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f4c7760a1d5..f8d6d8bba80 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -83,8 +83,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Desde albarán"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -998,8 +998,14 @@ msgstr "Para ser revisado por el contable."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Líneas de compra no facturadas"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1934,6 +1940,9 @@ msgstr "Tablero de compras"
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Factura de proveedor pre-generada en la recepción para control"
 
+#~ msgid "From Picking"
+#~ msgstr "Desde albarán"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
@@ -2160,6 +2169,9 @@ msgstr "Tablero de compras"
 #~ msgid "An invoice generated for a purchase order"
 #~ msgstr "Una factura generada por un pedido de compra."
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Líneas de compra no facturadas"
+
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "¡Error! No puede crear menús recursivos."
 
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 17060a7d1a6..a1a332e0405 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -71,8 +71,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Desde empaque"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -949,7 +949,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1827,6 +1833,9 @@ msgstr ""
 #~ msgid "Packing"
 #~ msgstr "Empaque"
 
+#~ msgid "From Picking"
+#~ msgstr "Desde empaque"
+
 #~ msgid "Purchase Process"
 #~ msgstr "Proceso de compra"
 
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index 410e170fdca..3760c59d5fb 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -75,8 +75,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Desde albarán"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -985,8 +985,14 @@ msgstr "Para ser revisado por el contable."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Líneas de compra no facturadas"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1900,6 +1906,12 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr "Tablero de compras"
 
+#~ msgid "From Picking"
+#~ msgstr "Desde albarán"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Líneas de compra no facturadas"
+
 #~ msgid "You can not have 2 pricelist version that overlaps!"
 #~ msgstr "No puede tener 2 versiones de tarifas que se superpongan!"
 
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 076c1e6fb0f..c42d975a303 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -85,8 +85,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Desde inventario"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -967,7 +967,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -2029,3 +2035,6 @@ msgstr ""
 
 #~ msgid "Waiting Schedule"
 #~ msgstr "Esperando Fecha"
+
+#~ msgid "From Picking"
+#~ msgstr "Desde inventario"
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 22a4f460d48..c96f3ee87a8 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:649
@@ -144,8 +144,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Noppest"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -979,7 +979,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1877,6 +1883,9 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Vastuvõtmistel kontrolliks eelgenereeritud tarnija arve"
 
+#~ msgid "From Picking"
+#~ msgstr "Noppest"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index 09189222864..aa89bc410cf 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -72,8 +72,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Vastaanotossa"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -117,7 +117,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:722
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "Valittu toimittaja myy tätä tuotetta vain %s"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:156
@@ -134,7 +134,7 @@ msgstr "Tilauksen viite tulee olla yksilöllinen!"
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "Keräilylistalta"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:649
@@ -188,7 +188,7 @@ msgstr "Oletushinnasto ostoille"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
 msgid "Current purchases"
-msgstr ""
+msgstr "Nykyiset hankinnat"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -250,7 +250,7 @@ msgstr "Hyväksytty"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Viitemittayksikkö"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -260,7 +260,7 @@ msgstr "Lähde"
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Viitemittayksikkö"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -322,7 +322,7 @@ msgstr "Summa netto:"
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure Your Purchases Management Application"
-msgstr ""
+msgstr "Konfiguroi ostonhallintajärjestelmäsi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
@@ -341,6 +341,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"Keräilylista luo laskun. Riippuen myyntitilauksen kontrolleista, lasku "
+"perustuu joko toimitettuun tai tilattuun määrään"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -353,7 +355,7 @@ msgstr "Peruttu"
 #: code:addons/purchase/purchase.py:305
 #, python-format
 msgid "Purchase amount over the limit"
-msgstr ""
+msgstr "Ostomäärä ylittää rajan"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -412,7 +414,7 @@ msgstr "Ostotilausta jonka tila on %s ei voi poistaa."
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Kohdeosoitteen yhteyshenkilö"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -453,7 +455,7 @@ msgstr "Varoitus"
 #. module: purchase
 #: field:purchase.installer,purchase_analytic_plans:0
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "Oston analyyttiset suunnitelmat"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_installer
@@ -478,7 +480,7 @@ msgstr "Tilausrivi"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Merkitsee että keräilylista on tehty"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:710
@@ -528,7 +530,7 @@ msgstr "Toimittajan Viite"
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Veron määrä"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -537,6 +539,8 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Keräilysilta luo toimittajalaskun. Riippuen ostotilauksen kontrolleista, "
+"lasku perustuu joko vastaanotettuun tai tilattuun määrään"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -553,6 +557,8 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Vastaantottoanalyysi mahdollistaa sinun tarkistaa ja analysoida helposti "
+"yrityksesi tavaranvastaanoton ja toimittajiesi toimituskyvyn."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -611,7 +617,7 @@ msgstr "Hinnastot"
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Osoitekontaktin nimi"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -627,7 +633,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Ostotilaukselle luodut laskut"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:282
@@ -646,12 +652,12 @@ msgstr "Yleiset tiedot"
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Oma työpöytä"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Ostotilauksen vahvistuksen numero"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -727,7 +733,7 @@ msgstr "Yhteensä"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "Vastaanotot"
 
 #. module: purchase
 #: field:purchase.order,validator:0
@@ -753,7 +759,7 @@ msgstr "Tarjouspyyntö"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Supplier Invoices to Receive"
-msgstr ""
+msgstr "Vastaanotettavat toimittajien laskut"
 
 #. module: purchase
 #: help:purchase.installer,purchase_requisition:0
@@ -761,6 +767,8 @@ msgid ""
 "Manages your Purchase Requisition and allows you to easily keep track and "
 "manage all your purchase orders."
 msgstr ""
+"Hallinnoi ostotilauspyyntöjä ja mahdollistaa helpon ostotilausten seurannan "
+"ja hallinnoinnin"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -783,6 +791,8 @@ msgstr "Manuaalinen"
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
+"Sinun pitää ensin peruuttaa kaikki keräilyt jotka liittyvät tähän "
+"ostotilaukseen"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -794,7 +804,7 @@ msgstr "Tilauksen päivämäärä"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "Hallittavat sisääntulevat tuotteet"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -824,7 +834,7 @@ msgstr "Luonnoslasku"
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
 msgid "Manages analytic distribution and purchase orders."
-msgstr ""
+msgstr "Hallinnoi analyyttista jakelua ja ostotilauksia"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -843,7 +853,7 @@ msgstr "Elokuu"
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
 msgid "Purchase Requisition"
-msgstr ""
+msgstr "Ostotilaus pyyntö"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
@@ -854,7 +864,7 @@ msgstr "Mittayksikköjen kategoriat"
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Toimitusaika (päivää)"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
@@ -898,7 +908,7 @@ msgstr "Kuukausi"
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Odottaa toimittajan vahvistusta"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -925,7 +935,7 @@ msgstr "Vastaanotettu"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "Luettelo tilatuista tuotteista"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
@@ -943,12 +953,18 @@ msgstr "Ostojen hallinta"
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Kirjanpitäjän tarkistettavaksi"
 
 #. 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1020,7 +1036,7 @@ msgstr "Terveisin,"
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "Toimittajaneuvottelut"
 
 #. module: purchase
 #: view:res.partner:0
@@ -1043,12 +1059,12 @@ msgstr "Veroton summa"
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Merkitsee että lasku on maksettu"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Laskutettavat lähtevät tuotteet"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1069,7 +1085,7 @@ msgstr "Erä ei ole samaa tuotetta"
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Tämän dokumentin luontipäivämäärä"
 
 #. module: purchase
 #: view:res.partner:0
@@ -1096,7 +1112,7 @@ msgstr "Käsin Laskutus"
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
-msgstr ""
+msgstr "Joku on juuri vahvistanut oston jonka määrä ylittää rajan"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1125,17 +1141,17 @@ msgstr "Sinun täytyy ensin perua kaikki ostotilaukseen liitetyt laskut."
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "Valitse useampia tilauksia niiden yhdistämiseksi listanäkymässä"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Keräilylista luotu"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "Poikkeus"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1169,6 +1185,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
 "less."
 msgstr ""
+"Valitulla toimittajalla on asetettu minimitilausmäärä %s, et voi tilata "
+"vähempää."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1193,7 +1211,7 @@ msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "Keräilylista on luotu saapuvien tavaroiden seuraamiseksi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
@@ -1204,7 +1222,7 @@ msgstr "Työpöytä"
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Tuotteiden arvo"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
@@ -1237,7 +1255,7 @@ msgstr "Tuotteet Kategorioittain"
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Vahvistettavat päivät"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1275,7 +1293,7 @@ msgstr "Tarjouspyynnöt"
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Päivä jolloin ostotilaus on hyväksytty"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1292,13 +1310,13 @@ msgstr "Oletus ostotilauksien hinnaston versio"
 #: view:purchase.installer:0
 msgid ""
 "Extend your Purchases Management Application with additional functionalities."
-msgstr ""
+msgstr "Laajenna ostonhallintajärjestelmääsi lisätoiminnoilla."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
 #: view:purchase.installer:0
 msgid "Purchases Application Configuration"
-msgstr ""
+msgstr "Oston ohjelmistojen konfiguraatio"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -1308,7 +1326,7 @@ msgstr "Talouskanta"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Tarjouspyynnön numero"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
@@ -1339,7 +1357,7 @@ msgstr "Ostotilauksen Rivit"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Toimittaja hyväksyy ostotilauksen."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1362,7 +1380,7 @@ msgstr "Yhdistä tilaukset"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Ostotilausrivi luo laskun"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
@@ -1402,7 +1420,7 @@ msgstr "Viittemme tilaukselle"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Etsi ostotilaus"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
@@ -1487,7 +1505,7 @@ msgstr "Odotettu toimitusosoite:"
 #: 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 ""
+msgstr "Vastaanottoanalyysi"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1538,7 +1556,7 @@ msgstr "Varaus"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Kokonaismäärä ja määrä kuukausittain"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:399
@@ -1586,7 +1604,7 @@ msgstr "Oletettu päivämäärä"
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
 #: view:purchase.report:0
 msgid "Total price by product by state"
-msgstr ""
+msgstr "Kokonaishinta tuotteittain ja tiloittain"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1644,7 +1662,7 @@ msgstr "Vuosi"
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Oston standardihinta"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1730,7 +1748,7 @@ msgstr "ALV:"
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Kokonaismäärä"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -2013,8 +2031,14 @@ msgstr "Hankintojen Työtila"
 #~ msgid "Request For Quotations"
 #~ msgstr "Tarjouspyynnöt"
 
+#~ msgid "From Picking"
+#~ msgstr "Vastaanotossa"
+
 #~ msgid "Confirmed Purchase"
 #~ msgstr "Vahvistettu ostotilaus"
 
 #~ msgid "Confirm Purchase order from Request for quotation"
 #~ msgstr "Vahvista ostotilaus tarjouspyynnöstä"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Ei laskutetut ostotilausrivit"
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 81b4e0d31b4..6f68bdd0cc2 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -84,8 +84,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Sur marchandise reçue"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1007,8 +1007,14 @@ msgstr "À vérifier par le comptable."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Lignes d'achat non facturées"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2153,8 +2159,14 @@ msgstr "Tableau de bord des achats"
 #~ msgid "In progress"
 #~ msgstr "En cours"
 
+#~ msgid "From Picking"
+#~ msgstr "Sur marchandise reçue"
+
 #~ msgid "To be Invoiced"
 #~ msgstr "À facturer"
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Lignes d'achat non facturées"
+
 #~ msgid "Product UoM"
 #~ msgstr "UdM du produit"
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index da36906d8c6..87d634bae25 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,7 +70,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -938,7 +938,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index d45d76e5707..683b87830fe 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -937,7 +937,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 3a29de80a79..38dd12566a6 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -81,8 +81,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Bevételezés alapján"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -995,8 +995,14 @@ msgstr "Ellenőrizendő a könyvelő által."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Nem számlázott beszerzés sorok"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2099,3 +2105,9 @@ msgstr "Beszerzési vezérlőpult"
 #~ "Önnek ki kell választania egy partnert a beszerzési űrlapon !\n"
 #~ "\"\n"
 #~ "\"Kérem adjon meg egy partnert mielőtt választ egy terméket."
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Nem számlázott beszerzés sorok"
+
+#~ msgid "From Picking"
+#~ msgstr "Bevételezés alapján"
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index a29bb44a3df..3cde6f2958f 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -83,8 +83,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Formulir Pengambilan"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -987,8 +987,14 @@ msgstr "Untuk di review oleh akuntan"
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Daftar pembelian tidak difakturkan"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1865,3 +1871,9 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
 msgstr ""
+
+#~ msgid "From Picking"
+#~ msgstr "Formulir Pengambilan"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Daftar pembelian tidak difakturkan"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 8224d1280a3..e56e5809a44 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -75,8 +75,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Da Prelievo"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -985,8 +985,14 @@ msgstr "Da controllare dal responsabile contabilità"
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Linee di acquisto non fatturate"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1909,6 +1915,9 @@ msgstr "Dashboard acquisti"
 #~ msgstr ""
 #~ "Non puoi avere due versioni dello stesso listino che si sovrappongono"
 
+#~ msgid "From Picking"
+#~ msgstr "Da Prelievo"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
@@ -2092,6 +2101,9 @@ msgstr "Dashboard acquisti"
 #~ msgid "To be Invoiced"
 #~ msgstr "Da fatturare"
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Linee di acquisto non fatturate"
+
 #~ msgid ""
 #~ "From the Purchase Orders menu, you can track the status of your orders: "
 #~ "products received, invoice received and controlled.\n"
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 8230d0ac38f..735fe0c6b20 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,8 +70,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "피킹으로부터"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -938,7 +938,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1809,6 +1815,9 @@ msgstr ""
 #~ "주문들은 동일한 파트너 및 동일한 위치를 향할 때만 합병될 수 있으며, 라인들은 수량과 유닛 외에는 정확히 동일할 경우에만 합쳐질 수 "
 #~ "있습니다."
 
+#~ msgid "From Picking"
+#~ msgstr "피킹으로부터"
+
 #~ msgid "Purchase Process"
 #~ msgstr "구매 프로세스"
 
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index f01fc3a7cfc..14eb20b5406 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,8 +69,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Iš važtaraščio"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -941,7 +941,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1840,6 +1846,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Netinkamas modelio pavadinimas veiksmo apibrėžime."
 
+#~ msgid "From Picking"
+#~ msgstr "Iš važtaraščio"
+
 #~ msgid "Packing"
 #~ msgstr "Važtaraštis"
 
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index b8a05efcba0..0c0e7592538 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -71,8 +71,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Түүврээс"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -952,8 +952,14 @@ 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 "Purchase Lines Not Invoiced"
-msgstr "Нэхэмжлэгдээгүй худалдан авалтын мөр"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1883,6 +1889,9 @@ msgstr "Худалдан авалт"
 #~ msgid "Approved Purchase"
 #~ msgstr "Зөвшөөрөгдсөн худалдан авалт"
 
+#~ msgid "From Picking"
+#~ msgstr "Түүврээс"
+
 #~ msgid "Invoice from Packing list"
 #~ msgstr "Савласан баримт дээр үндэслэж нэхэмжлэх"
 
@@ -2043,6 +2052,9 @@ msgstr "Худалдан авалт"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн архитектур алдаатай!"
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Нэхэмжлэгдээгүй худалдан авалтын мөр"
+
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
 
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 0aab98ea9f8..2092846d971 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,8 +70,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Fra plukking"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -946,7 +946,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1802,6 +1808,9 @@ msgstr "unikt nummer på innkjøpsordren, generert automatisk ved opprettelse"
 msgid "Purchase Dashboard"
 msgstr "Innkjøpskonsoll"
 
+#~ msgid "From Picking"
+#~ msgstr "Fra plukking"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ugyldig modellnavn i aksjonsdefinisjonen."
 
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index a27023a5832..06a4abfb2bd 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -82,8 +82,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Van ontvangsten"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -995,8 +995,14 @@ msgstr "Te controleren door de boekhouder."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Niet gefactureerde inkoopregels"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1925,6 +1931,9 @@ msgstr "Inkoop dashboard"
 #~ msgstr ""
 #~ "Concept-inkoopfactuur aangemaakt om binnenkomende goederen te controleren."
 
+#~ msgid "From Picking"
+#~ msgstr "Van ontvangsten"
+
 #~ msgid ""
 #~ "Please note that orders will only be merged if they are to the same partner "
 #~ "and going to the same location, and lines will only be merged if they are "
@@ -2124,3 +2133,6 @@ msgstr "Inkoop dashboard"
 #~ msgstr ""
 #~ "Er moeten een prijslijst worden geselecteerd in het inkoopformulier!\n"
 #~ "Selecteer een prijslijst voordat een product wordt gekozen."
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Niet gefactureerde inkoopregels"
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 59ae510f6bd..bea5f4d3470 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -937,7 +937,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 4a0e499ab8d..99672259fbc 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -79,8 +79,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Z pobrania"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -987,8 +987,14 @@ msgstr "Do sprawdzenia przez księgowego."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Pozycje zakupów nie zafakturowane"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2007,6 +2013,9 @@ msgstr "Konsola zakupów"
 #~ msgid "Request For Quotations"
 #~ msgstr "Zapytania ofertowe"
 
+#~ msgid "From Picking"
+#~ msgstr "Z pobrania"
+
 #~ msgid ""
 #~ "From Order: a draft invoice will be pre-generated based on the purchase "
 #~ "order. The accountant will just have to validate this invoice for control.\n"
@@ -2156,6 +2165,9 @@ msgstr "Konsola zakupów"
 #~ msgid "An invoice generated for a purchase order"
 #~ msgstr "Faktura wygenerowana dla zamówienia zakupu"
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Pozycje zakupów nie zafakturowane"
+
 #~ msgid "Error ! You can not create recursive Menu."
 #~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
 
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 3ee9bcdcd49..4ef1b193df2 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -72,8 +72,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "A partir da receção"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -957,8 +957,14 @@ msgstr "A ser revisto pelo contabilista"
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Linhas de ordens de compra não faturadas"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2057,6 +2063,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura da vista!"
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Linhas de ordens de compra não faturadas"
+
 #~ msgid ""
 #~ "From the Purchase Orders menu, you can track the status of your orders: "
 #~ "products received, invoice received and controlled.\n"
@@ -2080,3 +2089,6 @@ msgstr ""
 
 #~ msgid "An invoice generated for a purchase order"
 #~ msgstr "Uma fatura gerada por ordem de compra"
+
+#~ msgid "From Picking"
+#~ msgstr "A partir da receção"
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index a1bc7e0c481..8fb034b9764 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -84,8 +84,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "From Picking"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1001,8 +1001,14 @@ msgstr "Aguardando revisão do contador."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Linhas não faturadas do Pedido de Compra"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2259,3 +2265,9 @@ msgstr "Painel de Compras"
 
 #~ msgid "Product UoM"
 #~ msgstr "UdM do Produto"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Linhas não faturadas do Pedido de Compra"
+
+#~ msgid "From Picking"
+#~ msgstr "Do recebimento (separação)"
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 2764bf2b51f..20958481ac9 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -81,8 +81,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Din preluare"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -985,8 +985,14 @@ msgstr "Spre a fi revizuită de contabil."
 #. 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 "Purchase Lines Not Invoiced"
-msgstr "Linii de aprovizionat nefacturate"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1861,3 +1867,9 @@ msgstr "Panou de bord aprovizionare"
 
 #~ msgid "Order Ref"
 #~ msgstr "Ref. Comanda"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Linii de aprovizionat nefacturate"
+
+#~ msgid "From Picking"
+#~ msgstr "Din preluare"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index fae04160f91..310b6825dcc 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -73,8 +73,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "Из прихода"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -121,7 +121,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:722
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "Выбранный поставщик продает ТМЦ только по %s"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:156
@@ -463,7 +463,7 @@ msgstr "Предупреждение"
 #. module: purchase
 #: field:purchase.installer,purchase_analytic_plans:0
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "План счетов аналитики для закупок"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_installer
@@ -843,7 +843,7 @@ msgstr "Черновик счета"
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
 msgid "Manages analytic distribution and purchase orders."
-msgstr ""
+msgstr "Управление разнесением аналитики и заказами на закупку."
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -968,8 +968,14 @@ 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 "Purchase Lines Not Invoiced"
-msgstr "Закупаемые позиции без счетов"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
+msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1690,7 +1696,7 @@ msgstr "Утвердить"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr "Утвердить"
+msgstr "Одобрить"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -2024,6 +2030,9 @@ msgstr "Панель закупок"
 #~ msgid "Waiting Schedule"
 #~ msgstr "Расписание ожидания"
 
+#~ msgid "From Picking"
+#~ msgstr "Из прихода"
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a pricelist in the purchase form !\n"
@@ -2089,6 +2098,9 @@ msgstr "Панель закупок"
 #~ msgid "An invoice generated for a purchase order"
 #~ msgstr "Счет созданный для заказа на закупку"
 
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Закупаемые позиции без счетов"
+
 #~ msgid "The name of the group must be unique !"
 #~ msgstr "Название группы должно быть уникальным !"
 
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index 234f57e37dd..eb93ab484b2 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -71,7 +71,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -939,7 +939,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index 4c1e48e1ed5..f6cd7ae855a 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -941,7 +941,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index 552885fe204..efe6a6db7d9 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,7 +70,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -938,7 +938,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index 7cce73a7d0b..ddd8b010c7a 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/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: 2011-04-29 04:52+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:55+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,8 +70,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "IZ Izbora"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -946,7 +946,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1810,6 +1816,9 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Račun dobavljača pregenirisan prilikom prijema zbog kontrole"
 
+#~ msgid "From Picking"
+#~ msgstr "IZ Izbora"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
 
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 1bde3e0e20a..51c198f13d7 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,8 +70,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "IZ Izbora"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -946,7 +946,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1807,6 +1813,9 @@ msgstr ""
 msgid "Purchase Dashboard"
 msgstr ""
 
+#~ msgid "From Picking"
+#~ msgstr "IZ Izbora"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
 
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index cd5f0221776..c2bf121f9b1 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -71,8 +71,8 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "From Picking"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -949,7 +949,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -1820,6 +1826,9 @@ msgstr ""
 #~ msgid "Supplier Invoice pre-generated on receptions for control"
 #~ msgstr "Supplier Invoice pre-generated on receptions for control"
 
+#~ msgid "From Picking"
+#~ msgstr "From Picking"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index 3a619354bbd..eb6d20c7bea 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -23,12 +23,14 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"ผู้ซื้อต้องอนุมัติใบแจ้งขอใบเสนอราคาก่อนที่จะส่งให้ผู้จัดจำหน่าย "
+"จากนั้นใบแจ้งขอใบเสนอราคาจึงจะเปลี่ยนเป็นใบสั่งซื้อสถานะยืนยัน"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:282
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr ""
+msgstr "คุณไม่สามารถยืนยันใบสั่งซื้อที่ไม่มีรายการสั่งซื้อได้"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
@@ -48,7 +50,7 @@ msgstr "ปลายทาง"
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
 "of the product"
-msgstr ""
+msgstr "คุณต้องเลือกหน่วยของสินค้าที่อยู่ในประเภทเดียวกันกับหน่วยที่สั่งซื้อ"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -67,10 +69,17 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"คุณสามารถสร้างใบแจ้งขอใบเสนอราคาได้จากใบสั่งซื้อที่สถานะยังไม่ยืนยัน "
+"และใช้สำหรับตรวจสอบใบแจ้งขอใบเสนอราคาที่ระบบสร้างขึ้นอัตโนมัติจากกฎต่างๆ "
+"เช่น จากกฎการสั่งซื้อ เป็นต้น; คุณสามารถเปลี่ยนจากใบแจ้งขอใบเสนอราคา "
+"ให้เป็นใบสั่งซื้อสถานะยืนยันได้; "
+"หากคุณใช้มุมมองแบบแสดงทั้งหมด(สามารถเลือกได้จากการตั้งค่าของแต่ละผู้ใช้งาน) "
+"คุณจะสามารถเลือกรูปแบบการสร้างใบแจ้งหนี้โดย สร้างจากใบสั่งซื้อ, "
+"สร้างจากใบรับสินค้า และสร้างเอง"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -96,12 +105,12 @@ msgstr "ตรวจสอบโดย"
 #: view:purchase.report:0
 #: field:purchase.report,partner_id:0
 msgid "Supplier"
-msgstr "ผู้จำหน่าย"
+msgstr "ผู้จัดจำหน่าย"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices ?"
-msgstr ""
+msgstr "คุณต้องการสร้างใบแจ้งหนี้หรือไม่?"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -110,6 +119,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"ใช้เมนูนี้เพื่อค้นหาใบสั่งซื้อจาก เลขที่, ผู้จัดจำหน่าย, สินค้า เป็นต้น; "
+"คุณสามารถตรวจสอบสถานะใบสั่งซื้อได้ด้วยว่ารับสินค้ามาแล้วเท่าไหร่และแจ้งหนี้แล"
+"้วเท่าใด"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:722
@@ -121,24 +133,24 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_line_invoice.py:156
 #, python-format
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "ใบแจ้งหนี้จากผู้จัดจำหน่าย"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+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 ""
+msgstr "สร้างจากใบรับ/จ่ายสินค้า"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:649
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "ไม่มีรายการาคา!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
@@ -150,7 +162,7 @@ msgstr "จำนวน"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "เลือกใบสั่งขายสถานะเปิด"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -176,12 +188,12 @@ msgstr "กำหนดให้เป็นแบบร่าง"
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "ยกเว้นใบแจ้งหนี้"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "ใช้ค่าเริ่มต้นรายการราคาซื้อ"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
@@ -195,6 +207,8 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"ใส่ที่อยู่ในช่องนี้หากต้องการให้จัดส่งโดยตรงจากผู้จัดจำหน่ายไปยังลูกค้า, "
+"สินค้าจะไม่ถูกส่งเข้าคลังแต่จะถูกตั้งค่าให้ส่งไปยังลูกค้าแทน"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -202,11 +216,13 @@ 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 ""
+msgstr "แฟกซ์ :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -214,17 +230,19 @@ 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
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "ทยอยส่ง"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:286
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr ""
+msgstr "ใบสั่งซื้อ '%s' นี้ถูกยืนยันแล้ว"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -257,7 +275,7 @@ msgstr "หน่วยอ้างอิง"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr "จัดซื้อ"
+msgstr "ประวัติใบสั่งซื้อ"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -274,6 +292,8 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"คุณต้องเลือกรายการราคาและผู้จัดจำหน่ายลงในแบบฟอร์มใบสั่งซื้อ !\n"
+"กรุณาเลือกก่อนที่จะเลือกสินค้า"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -304,7 +324,7 @@ msgstr "ใบสั่งซื้อ"
 #: view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr "ข้อมูลอ้างอิงใบสั่งซื้อ"
+msgstr "เลขที่"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -314,7 +334,7 @@ msgstr "รวมสุทธิ :"
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure Your Purchases Management Application"
-msgstr ""
+msgstr "ตั้งค่าแอพพลิเคชั่นการจัดการซื้อ"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
@@ -325,7 +345,7 @@ msgstr "สินค้า"
 #. module: purchase
 #: field:purchase.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "ความก้าวหน้าการตั้งค่า"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -333,6 +353,9 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ "
+"ขึ้นอยู่กับการตั้งค่าในใบสั่งขายว่าเลือกให้สร้างใบแจ้งหนี้ จากการจัดส่ง "
+"หรือเลือกจากจำนวนสินค้าที่สั่ง"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -367,7 +390,7 @@ msgstr "ยกเว้นการจัดส่งสินค้า"
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "รายการจากใบแจ้งหนี้"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -393,23 +416,23 @@ msgstr "   เดือน   "
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr "ข้อมูลอ้างอิง"
+msgstr "เลขที่"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr ""
+msgstr "ไม่สามารถลบใบสั่งซื้อที่อยู่ในสถานะ %s ได้!"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "ที่อยู่ปลายทาง"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr "ย้ายสต็อก"
+msgstr "รายการเคลื่อนไหวสินค้า"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -421,7 +444,7 @@ msgstr "วัน"
 #: code:addons/purchase/purchase.py:334
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "ใบสั่งซื้อ '%s' ถูกเปลี่ยนเป็นสถานะฉบับร่างแล้ว"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -450,7 +473,7 @@ msgstr "แผนการจัดซื้อเชิงวิเคราะ
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_installer
 msgid "purchase.installer"
-msgstr ""
+msgstr "ตัวติดตั้งใบสั่งซื้อ"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -470,7 +493,7 @@ msgstr "รายการสั่งซื้อ"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "ช่องนี้บ่งบอกถึงการจัดส่งสินค้าเสร็จสมบูรณ์"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:710
@@ -505,17 +528,17 @@ msgstr "ยืนยัน"
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr "การควบคุมใบแจ้งหนี้"
+msgstr "เกี่ยวกับการแจ้งหนี้"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "พบข้อผิดพลาด! คุณไม่สามารถสร้างบริษัทที่มีลักษณะวนซ้ำกันได้"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "เลขที่อ้างอิงของผู้จัดจำหน่าย"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
@@ -529,6 +552,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"ใบแจ้งหนี้จะสามารถสร้างขึ้นจากใบรับ/จ่ายสินค้าได้หรือไม่ "
+"ขึ้นอยู่กับการตั้งค่าในใบสั่งซื้อว่าเลือกให้สร้างใบแจ้งหนี้ "
+"จากการสินค้าที่ได้รับ หรือเลือกจากจำนวนสินค้าที่สั่งซื้อ"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -545,6 +571,8 @@ 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
 #: report:purchase.quotation:0
@@ -576,7 +604,7 @@ msgstr "รายการสั่งซื้อ"
 #: code:addons/purchase/purchase.py:651
 #, python-format
 msgid "No Partner!"
-msgstr ""
+msgstr "ไม่พบผู้จัดจำหน่าย!"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -598,7 +626,7 @@ msgstr "จำนวนเงินที่ไม่ต้องเสียภ
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "รายการราคา"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -615,6 +643,12 @@ msgid ""
 "Manual: allows you to generate suppliers invoices by chosing in the "
 "uninvoiced lines of all manual purchase orders."
 msgstr ""
+"จากใบสั่งซื้อ: ใบแจ้งหนี้ฉบับร่างจะถูกสร้างขึ้นโดยยึดข้อมูลจากใบสั่งซื้อนี้ "
+"เจ้าหน้าที่บัญชีเพียงแค่ยืนยันความถูกต้องของใบแจ้งหนี้\n"
+"จากใบรับ: ใบแจ้งหนี้ฉบับร่างจะถูกสร้างขึ้นโดยยึดข้อมูลจากการรับสินค้า\n"
+"กำหนดเอง: "
+"อนุญาตให้สร้างใบแจ้งหนี้โดยเลือกรายการที่ยังไม่ถูกแจ้งหนี้ทั้งหมดของใบสั่งซื้"
+"อปัจจุบัน นำมาสร้างเป็นใบแจ้งหนี้"
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
@@ -638,12 +672,12 @@ msgstr "ข้อมูลทั่วไป"
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "กระดานงานของฉัน"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "ยืนยันใบสั่งซื้อเลขที่:"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -669,7 +703,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr "จากการ สั่งซื้อ"
+msgstr "สร้างจากใบสั่งซื้อ"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
@@ -679,7 +713,7 @@ msgstr "สร้างใบแจ้งหนี้"
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "ปลายทางการจอง"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:237
@@ -692,7 +726,7 @@ msgstr "การกระทำไม่ถูกต้อง !"
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Done"
-msgstr "เสร็จแล้ว"
+msgstr "เสร็จสมบูรณ์"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -775,6 +809,7 @@ msgstr "กำหนดเอง"
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
+"คุณต้องยกเลิกใบรับ/จ่ายสินค้าทั้งหมดที่เกี่ยวข้องกับใบสั่งซื้อนี้ก่อน"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -811,7 +846,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "ใบแจ้งหนี้ฉบับร่าง"
 
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
@@ -833,18 +868,18 @@ msgstr ""
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
 msgid "Purchase Requisition"
-msgstr ""
+msgstr "ใบขอซื้อ"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "หมวดหมู่ของหน่วยนับ"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "วันที่จัดส่งสินค้า"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
@@ -855,13 +890,13 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "ใบจัดหาสินค้า"
 
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "ใบแจ้งหนี้"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -871,7 +906,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "รูปภาพ"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -882,7 +917,7 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "เดือน"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -893,29 +928,29 @@ msgstr ""
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "ใบแจ้งขอใบเสนอราคา"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "ใบสั่งซื้อรอการอนุมัติ"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "รวมจำนวนเงิน(ไม่รวมภาษี)"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "สินค้าที่ได้รับ"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "รายการสินค้าที่สั่งซื้อ"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
@@ -927,47 +962,53 @@ msgstr ""
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+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 ""
+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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "ภาษี :"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
 #: field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "แจ้งหนี้แล้ว"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+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 ""
+msgstr "สถานะใบสั่งซื้อ"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  ปี  "
 
 #. module: purchase
 #: field:purchase.report,state:0
@@ -977,14 +1018,14 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+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 ""
+msgstr "รายการสั่งซื้อ"
 
 #. module: purchase
 #: constraint:res.partner:0
@@ -994,17 +1035,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "มุมมองปฏิทิน"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "รวมใบสั่งซื้อ"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "ด้วยความเคารพ,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
@@ -1015,7 +1056,7 @@ msgstr ""
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "เกี่ยวกับการสั่งซื้อ"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1033,7 +1074,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "ช่องนี้บ่งบอกถึงใบแจ้งหนี้ได้รับการจ่ายเงินแล้ว"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
@@ -1043,7 +1084,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "ตั้งค่า"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
@@ -1794,3 +1835,9 @@ msgstr ""
 
 #~ msgid "Purchase Orders in Progress"
 #~ msgstr "ใบสั่งซื้ออยู่ระหว่างดำเนินการ"
+
+#~ msgid "From Picking"
+#~ msgstr "จากใบรับสินค้า"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "รายการสั่งซื้อยังไม่ถูกแจ้งหนี้"
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index b5e9cd4ba8c..ad499e448b0 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -937,7 +937,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index fd8bbbfe065..4c8efc204f6 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,12 +22,15 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Alıcı, tedarikçiye gönderilmeden önce RFQ'yu onaylamalıdır. RFQ onaylanmış "
+"bir Satınalma Siparişi haline gelir."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:282
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
+"Satınalma siparişini, Alış Sipariş Kalemleri olmadan onaylayamazsınız."
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
@@ -48,11 +51,13 @@ msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
 "of the product"
 msgstr ""
+"Aynı kategoride, ürün satınalma biriminden başka, bir ürün birimi seçmeniz "
+"gerekir"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr ""
+msgstr "Bu belgenin oluşturulduğu tarih"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -66,16 +71,24 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Ürün almak istediğinizde bir tedarikçiye teklif isteği oluşturabilirsiniz, "
+"ancak satınalma henüz onaylamış değildir. Bu menüyü lojistik kurallarınız "
+"(minimum stok, MTO vb.) bazında otomatik olarak oluşturulan teklif "
+"isteklerini gözden geçirmek için de kullanabilirsiniz. Sipariş "
+"onaylandığında, teklif talebini bir satınalma siparişine "
+"dönüştürebilirsiniz. Uzatılmış arayüzü kullanırsanız (kullanıcı tercihleri), "
+"tedarikçi faturalarınızı kontrol etme yönteminizi seçebilirsiniz: sipariş "
+"bazında, manuel kodlama veya resepsiyon bazında."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "İrsaliyeden"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "Faturalandırılmadı"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
@@ -100,7 +113,7 @@ msgstr "Tedarikçi"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices ?"
-msgstr ""
+msgstr "Tedarikçi faturalarını oluşturmak istiyor musunuz?"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -109,35 +122,38 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Bu menüyü referanslar, tedarikçi, ürün vb. göre satınalma siparişlerinizde "
+"arama yapmak için kullanın. Her bir satın alma siparişi için, alınan "
+"ürünleri izleyebilir ve tedarikçi faturalarını kontrol edebilirsiniz."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:722
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "Seçilen tedarikçi bu ürünün sadece %s'ini satar"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:156
 #, python-format
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Tedarikçi Faturaları"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Sipariş Referansı özgün olmalıdır!"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "Alım listesinden"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:649
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "Fiyat listesi yok!"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
@@ -149,7 +165,7 @@ msgstr "Miktar"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Bir Açık Satış Siparişi Seçin"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -157,14 +173,14 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Şirket"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Kategoriye göre Aylık Satınalma"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -185,7 +201,7 @@ msgstr "Varsayılan Alış Fiyat Listesi"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
 msgid "Current purchases"
-msgstr ""
+msgstr "Mevcut satınalmalar"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -194,6 +210,9 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Doğrudan tedarikçiden müşteriye teslim etmek istiyorsanız, bir adres girin. "
+"Bu durumda, depo bağlantısını kaldıracak ve müşteri lokasyonunu "
+"ayarlayacaktır."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -201,11 +220,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Mevcut ortaktan satınalmalarda, varsayılan yerine bu fiyat listesi "
+"kullanılacaktır"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faks:"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -213,17 +234,20 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
+"Fiyat listesi bu satınalma siparişi için kullanılacak para birimini "
+"belirler. Ayrıca, seçilen ürünler/miktarlar için tedarikçi fiyatını da "
+"hesaplar."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Kısmi Alım"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:286
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr ""
+msgstr "Satınalma siparişi '%s' onaylandı."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -241,7 +265,7 @@ msgstr "Onaylanmış"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Referans UOM"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -251,12 +275,12 @@ msgstr "Menşei"
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referans UoM"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "Satınalmalar"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -273,11 +297,13 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Satınalma formunda bir fiyat listesi veya bir tedarikçi seçmeniz gerekiyor!\n"
+"Lütfen bir ürün seçmeden önce birini belirtin."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -313,18 +339,18 @@ msgstr "Net Toplam :"
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure Your Purchases Management Application"
-msgstr ""
+msgstr "Satınalma Yönetim Uygulamanızı Yapılandırın"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 msgid "Products"
-msgstr ""
+msgstr "Ürünler"
 
 #. module: purchase
 #: field:purchase.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Yapılandırma İlerleyişi"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -332,6 +358,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"Alım listesi bir fatura oluşturur. Satış siparişi faturalama kontrolüne "
+"bağlı olarak, fatura teslimata ya da sipariş edilen miktarlara bağlıdır."
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -344,12 +372,12 @@ msgstr "İptal Edildi"
 #: code:addons/purchase/purchase.py:305
 #, python-format
 msgid "Purchase amount over the limit"
-msgstr ""
+msgstr "Satınalma miktarı limitin üzerinde"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "Satınalma Siparişine Dönüştür"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0
@@ -366,7 +394,7 @@ msgstr "İstisnai Sevkiyat"
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Fatura Kalemleri"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -377,17 +405,17 @@ msgstr "Gelen Ürünler"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Giden Ürünler"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "Manuel Olarak Düzeltildi"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Ay   "
 
 #. module: purchase
 #: view:purchase.order:0
@@ -398,29 +426,29 @@ msgstr "Referans"
 #: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr ""
+msgstr "%s Durumundaki Satınalma Sipariş(ler)i silinemez!"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Varılacak Adres İlgili Kişi"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Stok Hareketi"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Gün"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:334
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "Satınalma siparişi '%s' taslak olarak ayarlandı."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -431,7 +459,7 @@ msgstr "Analiz Hesabı"
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# / Satır"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:685
@@ -439,22 +467,22 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: purchase
 #: field:purchase.installer,purchase_analytic_plans:0
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "Satınalma Analitik Planları"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_installer
 msgid "purchase.installer"
-msgstr ""
+msgstr "purchase.installer"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Taslak"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -469,13 +497,13 @@ msgstr "Sipariş Kalemi"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Bir alım gerçekleştirildiğini gösterir"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:710
 #, python-format
 msgid "Wrong Product UOM !"
-msgstr ""
+msgstr "Hatalı Birim!"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
@@ -487,7 +515,7 @@ msgstr "Onaylandı"
 #: view:purchase.report:0
 #: field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Ortalama Fiyat"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -509,17 +537,17 @@ msgstr "Fatura Kontrolü"
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Tedarikçi Referansı"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Vergi miktarı"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -528,6 +556,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Alım listesi bir tedarikçi faturası oluşturur. Satınalma siparişi faturalama "
+"kontrolüne bağlı olarak, fatura alınanlara ya da sipariş edilen miktarlara "
+"dayanır."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -536,7 +567,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -544,11 +575,14 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Resepsiyon Analizi şirketinizin sipariş resepsiyonlarını ve tedarikçi "
+"teslimatlarınızın performansını kolayca kontrol ve analiz edebilmenizi "
+"sağlar."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
@@ -559,12 +593,12 @@ msgstr "Hazırlık Listesi"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Satınalma siparişlerini birleştir"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
@@ -575,7 +609,7 @@ msgstr "Sipariş Kalemleri"
 #: code:addons/purchase/purchase.py:651
 #, python-format
 msgid "No Partner!"
-msgstr ""
+msgstr "Ortak yok!"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -586,7 +620,7 @@ msgstr "Fax:"
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Toplam Fiyat"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -597,12 +631,12 @@ msgstr "Tutar"
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "Fiyat listeleri"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Adres İlgili Kişi"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -614,11 +648,17 @@ msgid ""
 "Manual: allows you to generate suppliers invoices by chosing in the "
 "uninvoiced lines of all manual purchase orders."
 msgstr ""
+"Şiparişten: satınalma siparişine dayanarak önceden bir taslak fatura "
+"oluşturulacaktır. Hesap uzmanının bu kontrol faturasını onaylaması gerekir.\n"
+"İrsaliyeden: onaylanan resepsiyonlara dayanarak önceden bir taslak fatura "
+"oluşturulacaktır.\n"
+"Manuel: tüm manuel satınalma siparişlerinin faturalanmamış kalemleri "
+"arasından seçim yaparak tedarikçi faturaları oluşturmanızı sağlar."
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Bir satınalma siparişi için oluşturulan faturalar"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:282
@@ -627,17 +667,17 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Hata!"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Genel Bilgiler"
 
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "My Board"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -651,11 +691,14 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Satınalma Analizi şirketinizin satınalma geçmişi ve performansını kolayca "
+"kontrol ve analiz etmenizi sağlar. Bu menüden ciro performansınızı, "
+"tedarikçilerinizin teslimat performansını vb. takip edebilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
-msgstr ""
+msgstr "Tedarikçi tarafından onaylandı"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -664,6 +707,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Satınalma siparişi  'Alım' durumundaysa, fatura otomatik olarak oluşturulur. "
+"Fatura hesap uzmanı tarafından manuel olarak da oluşturulabilir (Fatura "
+"kontrolü = Manuel)."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -684,7 +730,7 @@ msgstr "Rezervasyon Yeri"
 #: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Geçersiz işlem!"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -696,19 +742,19 @@ msgstr "Bitti"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Yapılandırma"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
 #: view:purchase.report:0
 msgid "Purchase by supplier"
-msgstr ""
+msgstr "Tedarikçiye göre satınalma"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -718,7 +764,7 @@ msgstr "Toplam Tutar"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "Resepsiyonlar"
 
 #. module: purchase
 #: field:purchase.order,validator:0
@@ -734,6 +780,10 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Bu menüyü tedarikçinizden alınacak faturaları kontrol etmek için kullanın. "
+"OpenERP, ayarlarınıza bağlı olarak satınalma siparişlerinizden veya "
+"resepsiyonlarınızdan önceden taslak faturalar oluşturur. Bir tedarikçi "
+"faturası aldığınızda, taslak faturayla karşılaştırıp onaylayabilirsiniz."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -744,7 +794,7 @@ msgstr "Teklif İsteği"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Supplier Invoices to Receive"
-msgstr ""
+msgstr "Alınacak Tedarikçi Faturaları"
 
 #. module: purchase
 #: help:purchase.installer,purchase_requisition:0
@@ -752,17 +802,20 @@ msgid ""
 "Manages your Purchase Requisition and allows you to easily keep track and "
 "manage all your purchase orders."
 msgstr ""
+"Satınalma Talebinizi yönetir ve tüm satınalma siparişlerinizi kolayca takip "
+"edip yönetmenizi sağlar."
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Ay-1    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:363
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Bu şirket tarafından belirtilen satınalma günlüğü yok: \"%s\" (id:%d)"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -774,28 +827,29 @@ msgstr "Manuel"
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
+"Öncelikle bu satınalma siparişine bağlı tüm alımları iptal etmeniz gerekir."
 
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Sipariş Tarihi"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "Kontrol edilecek gelen ürünler"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "Onay"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "Satınalma Siparişi İstatistikleri"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -805,6 +859,11 @@ msgid ""
 "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
 "can generate a draft supplier invoice based on the lines from this menu."
 msgstr ""
+"Bir satınalma siparişindeki faturalama kontrolünü \"Manuel\" olarak "
+"ayarlarsanız, tedarikçiden henüz faturasını almadığınız tüm satınalma "
+"sipariş kalemlerinizi buradan takip edebilirsiniz. Bir tedarikçi faturası "
+"almak için hazır olduğunuzda, bu menüdeki satırlar bazında bir taslak "
+"tedarikçi faturası hazırlayabilirsiniz."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -815,7 +874,7 @@ msgstr "Taslak Fatura"
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
 msgid "Manages analytic distribution and purchase orders."
-msgstr ""
+msgstr "Analitik dağıtım ve satınalma siparişlerini yönetir."
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -823,71 +882,73 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"Bu, tüm satınalma sipariş kalemine ait ürünleri minimum zamanlanan tarih "
+"olarak hesaplar."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
 msgid "Purchase Requisition"
-msgstr ""
+msgstr "Satınalma Talebi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Kategori Ölçüm Birimleri"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Teslimat Günleri"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "Ürünleri Al"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Satınalma"
 
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Faturalar"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Faturalandırılacak onaylanan satınalma siparişi"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Görüntü"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Aylık Toplam Kullanıcı Sipariş Kalemleri"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Tedarikçi Onayı Bekleniyor"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -903,7 +964,7 @@ msgstr "Onay Bekleyen Alış Siparişi"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Vergilendirilmemiş toplam tutar"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -914,13 +975,13 @@ msgstr "Alınan"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "Sipariş edilen ürün listesi."
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "Bu satınalma için oluşturulmuş satınalma listesidir"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -932,12 +993,18 @@ msgstr "Satınalma Yönetimi"
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Hesap uzmanı tarafından incelenecek."
 
 #. 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -955,28 +1022,28 @@ msgstr "Faturalandı"
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. 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 ""
+msgstr "Satınalma Siparişinin Durumu."
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Yıl  "
 
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Sipariş Durumu"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Fatura oluştur"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
@@ -988,7 +1055,7 @@ msgstr "Alış Sipariş Kalemi"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Hata! Yinelemeli üyeler oluşturamazsınız."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -998,23 +1065,23 @@ msgstr "Takvimi Göster"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "Satınalma Siparişi Birleştirme"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Saygılar,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "Tedarikçi Cirosu"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Satınalma Özellikleri"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1023,6 +1090,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Satınalma siparişi, alıcı tarafından onaylandığı anda bir tedarikçi faturası "
+"oluşturur. Satınalma siparişi faturalama kontrolüne göre, fatura alınanlara "
+"ya da sipariş edilen miktarlara dayanır."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1032,104 +1102,106 @@ msgstr "Tutar"
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Bir faturanın ödendiğini gösterir"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Faturalandırılacak giden ürünler"
 
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Yapılandır"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
 #: view:purchase.report:0
 msgid "Qty. per product"
-msgstr ""
+msgstr "Ürün miktarı"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Aynı üründen olmayan bir lot atamaya çalışıyorsunuz"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Bu belgenin oluşturulduğu tarih."
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Satışlar ve Satınalmalar"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Satınalma Siparişleri"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Manuel Faturalar"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:308
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
-msgstr ""
+msgstr "Bir satınalma belirtilen sınırın üzerindeki bir tutarla onaylandı"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uzatılmış Filtreler..."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:352
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Bu ürün için belirtilen masraf tutarı yok: \"%s\" (id:%d)"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:408
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
+"Öncelikle bu satınalma siparişine bağlı tüm faturaları iptal etmeniz gerekir."
 
 #. 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 ""
+"Lütfen liste görünümünde birleştirmek için birden fazla sipariş seçin."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Alım listesi oluşturuldu"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "İstisna"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1150,6 +1222,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Satınalma modülü, bir tedarikçiden mal satın almak üzere bir satınalma "
+"siparişi oluşturmak içindir.\n"
+"    Belirli mevcut sipariş için bir tedarikçi faturası oluşturulur\n"
+"    Şunları içeren satınalma yönetimi performans tablosu:\n"
+"    * Mevcut Satınalma Siparişleri\n"
+"    * Taslak Satınalma Siparişleri\n"
+"    * Aylık tutar ve miktar grafiği    \n"
+"\n"
+"    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:685
@@ -1158,16 +1240,18 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
 "less."
 msgstr ""
+"Seçilen tedarikçi %s'a ayarlanan minimum miktara sahiptir, daha düşük bir "
+"satınalma yapamazsınız."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Şirketler"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1177,40 +1261,40 @@ msgstr "Alış Siparişini İptal Et"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Bu ürüne bir üretim grubu atamanız gerekir"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "Gelen ürünleri izlemek için bir alım listesi oluşturulur."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Performans tablosu"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Ürün Tutarı"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
 msgid "Pricelists Types"
-msgstr ""
+msgstr "Fiyat Listesi Türleri"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Teklifler"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
 #: view:purchase.report:0
 msgid "Purchase order per month"
-msgstr ""
+msgstr "Aylık satınalma siparişi"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1220,18 +1304,18 @@ msgstr "Geçmiş Bilgisi"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Kategoriye göre ürünler"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Onaylama Günleri"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "Bu satınalma sipariş talebini oluşturan belge referansı."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1243,6 +1327,13 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Satınalma siparişi ya da teklif talebi durumu. Teklif, 'Taslak' durumundaki "
+"bir satınalma siparişidir. Daha sonra sipariş kullanıcı tarafından "
+"onaylanarak 'Onaylandı' durumuna geçmelidir. Ardından sipariş tedarikçi "
+"tarafından onaylanarak 'Onaylandı' durumuna geçmelidir. Satınalma siparişi "
+"ödenip alındığında, durum 'Tamamlandı' olarak değişir. Malların "
+"resepsiyonunda ya da faturada bir iptal etme işlemi meydana gelirse, durum "
+"istisna olarak değişir."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1253,12 +1344,12 @@ msgstr "Alt Toplam"
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "Teklif Talepleri"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Satınalma siparişinin onaylandığı tarih"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1275,13 +1366,13 @@ msgstr "Varsayılan Alış Fiyat Listesi Vers."
 #: view:purchase.installer:0
 msgid ""
 "Extend your Purchases Management Application with additional functionalities."
-msgstr ""
+msgstr "Satınalma Yönetim Uygulamanızı ilave işlevselliklerle genişletin."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
 #: view:purchase.installer:0
 msgid "Purchases Application Configuration"
-msgstr ""
+msgstr "Satınalma Uygulama Yapılandırması"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -1302,7 +1393,7 @@ msgstr "Fatura"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1322,7 +1413,7 @@ msgstr "Alış Sipariş Kalemleri"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Tedarikçi Satınalma Siparişini onaylar."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1335,27 +1426,27 @@ msgstr "Alış Siparişleri"
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Kaynak Belge"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "Siparişleri birleştir"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Satınalma Sipariş Kalemi Faturalandırma"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Gelen Sevkıyatlar"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Aylık Toplam Kullanıcı Siparişi"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
@@ -1367,14 +1458,14 @@ msgstr "Teklif İsteği"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "Tél. :"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0
 #: view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1385,7 +1476,7 @@ msgstr "Bizim Sipariş Referansımız"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Satınalma Siparişi Arama"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
@@ -1398,12 +1489,12 @@ msgstr "Depo"
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "Teklif talebi."
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "Talep Tarihi."
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
@@ -1415,7 +1506,7 @@ msgstr "Onaylanmış Tarih"
 #: code:addons/purchase/purchase.py:407
 #, python-format
 msgid "Could not cancel this purchase order !"
-msgstr ""
+msgstr "Bu satınalma siparişi iptal edilemedi!"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1426,12 +1517,12 @@ msgstr "Birim Fiyat"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "Teslimat ve Faturalama"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Zamanlanan Tarih"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
@@ -1447,7 +1538,7 @@ msgstr "Ürün"
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Onaylama"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1459,7 +1550,7 @@ msgstr "Açıklama"
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Bu, her bir satınalma siparişi için tedarik/emniyet süresidir."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1470,12 +1561,12 @@ msgstr "Tahmini Teslimat Adresi"
 #: 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 ""
+msgstr "Resepsiyon Analizi"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Vergilendirilmemiş tutar"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1484,6 +1575,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Tedarikçi kayıtlarınıza erişin ve tedarikçilerinizle olan iyi ilişkilerinizi "
+"sürdürün. Geçmiş sekmesiyle tüm işlemlerinizi izleyebilirsiniz: e-postalar, "
+"siparişler, toplantılar vb."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1494,7 +1588,7 @@ msgstr "Teslimat"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "Kotasyon Talebi"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1510,7 +1604,7 @@ msgstr "Mik."
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
@@ -1521,13 +1615,13 @@ msgstr "Rezervasyon"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Aylık Toplam Miktar ve Tutar"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:399
 #, python-format
 msgid "Could not cancel purchase order !"
-msgstr ""
+msgstr "Satınalma siparişi iptal edilemedi!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1535,22 +1629,24 @@ 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 ""
+"Bu ürün için tedarikçi olmaması durumunda, alıcı formu manuel olarak "
+"doldurup onaylayabilir. RFQ, onaylanan bir Satınalma Siparişi haline gelir."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Products Categories"
-msgstr ""
+msgstr "Ürün Kategorileri"
 
 #. 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 ""
+msgstr "Satınalma Analizi"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1569,12 +1665,12 @@ msgstr "Tahmini Tarih"
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
 #: view:purchase.report:0
 msgid "Total price by product by state"
-msgstr ""
+msgstr "Ürün durumuna göre toplam fiyat"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA:"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1595,12 +1691,12 @@ msgstr "Alış Kontrolü"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1617,17 +1713,29 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Lütfen şunlara dikkat edin: \n"
+" \n"
+" Siparişler sadece şu durumlarda birleştirilecektir: \n"
+" * Satınalma Siparişleri taslak halindeyken \n"
+" * Satınalma Siparişleri aynı tedarikçiye ait olduğunda \n"
+" * Satınalma Siparişleri aynı stok lokasyonu ve aynı fiyat listesine sahip "
+"olduğunda \n"
+" \n"
+" Kalemler sadece şu durumlarda birleştirilebilir: \n"
+" * Sipariş kalemleri, ürün, miktar ve birim haricinde tamamen aynı olduğunda "
+"\n"
+" "
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Satınalma-Standart Fiyat"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1648,7 +1756,7 @@ msgstr "Onayla"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Onaylamak için"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1666,12 +1774,20 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * Satınalma siparişi taslak durumundayken, otomatik olarak 'Taslak' durumu "
+"ayarlanır.                                        \n"
+"* Satınalma siparişi onay durumundayken, otomatik olarak 'Onaylandı' durumu "
+"ayarlanır.                                        \n"
+"* Satınalma siparişi yapıldı olarak ayarlandığında, otomatik olarak "
+"'Yapıldı' durumu ayarlanır.                                        \n"
+"* Kullanıcı satınalma siparişini iptal ettiğinde, otomatik olarak 'İptal "
+"edildi' durumu ayarlanır."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:414
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "Satınalma siparişi '%s' iptal edildi."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1681,49 +1797,49 @@ msgstr "Toplam"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Fiyat Listesi Sürümleri"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adresler"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
-msgstr ""
+msgstr "Bu siparişleri birleştirmek istiyor musunuz?"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "...'ya Göre Grupla"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Satınalma siparişinden"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Toplam tutar"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Satınalma Tedarik Süresii"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1732,17 +1848,20 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Satınalma siparişinin fatura kontrolü 'İşlemde' ise, fatura otomatik olarak "
+"oluşturulur. Fatura hesap uzmanı tarafından manuel olarak da oluşturulabilir "
+"(Fatura kontrolü = Manuel)."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Satınalma"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Ortak"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:651
@@ -1751,16 +1870,18 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"Satınalma formunda bir ortak seçmeniz gerekir !\n"
+"Lütfen bir ürün seçmeden önce bir ortak seçin."
 
 #. module: purchase
 #: view:purchase.installer:0
 msgid "title"
-msgstr ""
+msgstr "başlık"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_move
 msgid "Partial Move"
-msgstr ""
+msgstr "Kısmi Hareket"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1771,12 +1892,12 @@ msgstr "Stok Hareketi"
 #: 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 ""
+msgstr "Ölçü Birimleri"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "Siparişler"
 
 #. module: purchase
 #: help:purchase.order,name:0
@@ -1784,16 +1905,21 @@ msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
 msgstr ""
+"özgün satınalma siparişi numarası, satınalma siparişi oluşturulduğunda "
+"otomatik olarak belirlenir"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "Satınalma Performans Tablosu"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
+#~ msgid "From Picking"
+#~ msgstr "İrsaliyeden"
+
 #~ msgid "Confirmed Purchase"
 #~ msgstr "Onaylanan Alış"
 
@@ -1901,3 +2027,6 @@ msgstr ""
 
 #~ msgid "Approving Purchase Order"
 #~ msgstr "Alış Sipariş Onaylaması"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "Satınalma Kalemleri Faturalandırılmadı"
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 506c358ecb5..eca571737ee 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -939,7 +939,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index d385b0a9844..7c7e1766eef 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -70,7 +70,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -309,7 +309,7 @@ msgstr "Số tham chiếu đơn hàng"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr "Tổng số thực:"
+msgstr "Tổng số thực :"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -938,7 +938,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 0c8e026da5d..b93c40c12f2 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -13,21 +13,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. 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 "RFQ 必须先得到采购经理确认才能发给供货方。 RFQ 即成为确认的采购订单。"
+msgstr "询价单(RFQ) 必须先得到采购经理核准才能发给供应商。 询价单能确认为采购订单。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:282
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
-msgstr "采购订单无明细，你无权确认。"
+msgstr "采购订单无明细，您不能确认。"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
@@ -47,12 +47,12 @@ msgstr "目的地"
 msgid ""
 "You have to select a product UOM in the same category than the purchase UOM "
 "of the product"
-msgstr ""
+msgstr "您选择的产品计量单位与产品的采购单位是同一的类型。"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "文件生成日期"
+msgstr "文档生成日期"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -66,11 +66,13 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"当您向供应商购买产品时您能创建一个询价但采购还没确认。询价基于您的后勤规则(最少库存，MTO(按单生产)等)。询价确认后转为采购订单。如果您使用扩展接口("
+"在用户偏好里)，您能选择控制供应商开发票的习惯：基于这订单，基于接收或者手动。"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
-msgstr "来自领料/提货"
+msgid "From Reception"
+msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -100,7 +102,7 @@ msgstr "供应商"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices ?"
-msgstr "生成供货发票吗？"
+msgstr "生成供应商发票吗？"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -108,19 +110,19 @@ msgid ""
 "Use this menu to search within your purchase orders by references, supplier, "
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
-msgstr ""
+msgstr "使用这菜单按关联单号，供应商，产品等搜索您的采购订单，您可以跟踪接收的产品和控制供应商的发票。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:722
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "选择的供应商只销售这产品  %s"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:156
 #, python-format
 msgid "Supplier Invoices"
-msgstr "供货发票"
+msgstr "供应商发票"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
@@ -131,7 +133,7 @@ msgstr "单号必须唯一！"
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr "来源自分拣单"
+msgstr "来自装箱单"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:649
@@ -149,7 +151,7 @@ msgstr "数量"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr "选择一个打开的销售订单"
+msgstr "选择开启的销售订单"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -164,7 +166,7 @@ msgstr "公司"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr "每个种类采购的月汇总"
+msgstr "采购按月分类"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -185,7 +187,7 @@ msgstr "默认采购价格表"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
 msgid "Current purchases"
-msgstr "正在进行的采购"
+msgstr "当前的采购"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -193,14 +195,14 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
-msgstr "如果你想直接从供应商送货到客户填入地址.这个业务个案它将删除与仓库的连接并设置客户地址"
+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 "这价格表将用于当前业务伙伴采购的价格表而不是默认的价格表"
+msgstr "这价格表将替代当前业务伙伴采购的默认价格表"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -212,12 +214,12 @@ msgstr "传真 ："
 msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
-msgstr "采购订单使用的价格表.它还计算选定产品的供应商价格/数量"
+msgstr "设定采购订单价格表使用的币别。它还计算出选定产品/数量的供应商价格。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr "部分交货"
+msgstr "部分装箱单"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:286
@@ -236,27 +238,27 @@ msgstr "批准采购"
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr "已通过"
+msgstr "已核准"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr "相关计量单位"
+msgstr "计量单位"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr "原产地"
+msgstr "来源"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr "相关计量单位"
+msgstr "计量单位"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr "采购单"
+msgstr "采购订单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -273,13 +275,13 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
-"请先从采购单里选择一个价格表或者供应商！\n"
+"请在采购窗口选择价格表或供应商！\n"
 "然后再选择产品。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -287,7 +289,7 @@ msgstr "九月"
 #: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr "税金"
+msgstr "税"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -305,7 +307,7 @@ msgstr "采购订单"
 #: view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr "订单引用"
+msgstr "单号"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -315,7 +317,7 @@ msgstr "净总额："
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure Your Purchases Management Application"
-msgstr "配置您的采购管理应用"
+msgstr "设置您的采购管理应用"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
@@ -326,14 +328,14 @@ msgstr "产品"
 #. module: purchase
 #: field:purchase.installer,progress:0
 msgid "Configuration Progress"
-msgstr "配置进度"
+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 "
 "sale order, the invoice is based on delivered or on ordered quantities."
-msgstr "领货清单，根据订货或者交货数量，再生成发票。"
+msgstr "装箱单生成一发票，然后这发票控制销售订单，发票是基于交付的或订单上的数量。"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -374,12 +376,12 @@ msgstr "发票明细"
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr "入库货品"
+msgstr "接收的产品"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr "出库货品"
+msgstr "发出的产品"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -394,7 +396,7 @@ msgstr "   月   "
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr "引用"
+msgstr "单号"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:237
@@ -422,18 +424,18 @@ msgstr "天"
 #: code:addons/purchase/purchase.py:334
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr "采购单“%s”已经设为草稿"
+msgstr "采购订单 “%s” 已经设为草稿"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr "笔明细"
+msgstr "# 明细"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:685
@@ -471,13 +473,13 @@ msgstr "采购订单明细"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "这表示装箱单已完成"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:710
 #, python-format
 msgid "Wrong Product UOM !"
-msgstr "错误的货品计量单位！"
+msgstr "错误的产品计量单位！"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
@@ -506,7 +508,7 @@ msgstr "确认"
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr "发票控制"
+msgstr "发票管理"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -516,7 +518,7 @@ msgstr "错误！您不能创建递归公司."
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr "供应商参考"
+msgstr "供应商单号"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
@@ -529,7 +531,7 @@ 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 ""
+msgstr "装箱单生成供应商发票。采购订单控制发票，发票是基于接收或订单的数量。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -545,7 +547,7 @@ msgstr "状态"
 msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
-msgstr ""
+msgstr "接收分析使您轻松检查和分析您公司订单的接收数量和您供应商交货的特性。"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -556,7 +558,7 @@ msgstr "电话:"
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -566,7 +568,7 @@ msgstr "打印"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "合并采购订单"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
@@ -588,7 +590,7 @@ msgstr "传真:"
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "总价格"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -616,11 +618,14 @@ msgid ""
 "Manual: allows you to generate suppliers invoices by chosing in the "
 "uninvoiced lines of all manual purchase orders."
 msgstr ""
+"来自订单：发票草稿根据采购订单预先生成。会计人员对发票的控制只需确认。\n"
+"来自装箱单：发票草稿根据已确认的收货单预先生成。\n"
+"手动：允许您在所有未开票的采购订单的明细中挑选生成供应商发票。"
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr "采购单的发票已生成"
+msgstr "采购订单的发票已生成"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:282
@@ -639,7 +644,7 @@ msgstr "一般信息"
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr "我的面板"
+msgstr "我的控制台"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -652,7 +657,7 @@ 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 ""
+msgstr "采购分析使您轻松检查和分析您公司的采购日志和特性，在这菜单您能跟踪您协商的特性和您供应商送货的特性等。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -665,7 +670,7 @@ 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 ""
+msgstr "如果这采购订单的发票控制是“来自装箱单”发票将自动生成。发票也可以是会计人员手工生成(发票控制 = 手动)。"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -698,13 +703,13 @@ msgstr "完成"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr "配置"
+msgstr "设置"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
@@ -715,18 +720,18 @@ msgstr "按供应商汇总采购"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr "金额合计"
+msgstr "总金额"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "接收"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr "审核人:"
+msgstr "审批人"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -736,6 +741,7 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"使用这菜单控制您供应商收到的发票。系统根据您的设定从您的采购订单或者收货单生成发票草稿。一旦您收到供应商的发票，您可以匹配发票的草稿并审核它。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -746,25 +752,25 @@ msgstr "询价单"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Supplier Invoices to Receive"
-msgstr ""
+msgstr "接收到的供应商发票"
 
 #. module: purchase
 #: help:purchase.installer,purchase_requisition:0
 msgid ""
 "Manages your Purchase Requisition and allows you to easily keep track and "
 "manage all your purchase orders."
-msgstr ""
+msgstr "管理您的采购申请和使您轻松跟踪和管理您所有的采购订单"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:363
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "公司没定义这采购分录序时薄：\"%s\" (id:%d)"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -775,7 +781,7 @@ msgstr "手动"
 #: code:addons/purchase/purchase.py:400
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
-msgstr ""
+msgstr "您必须先取消这采购订单的所有装箱单。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -787,17 +793,17 @@ msgstr "订单日期"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "控制接收的产品"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "同意"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr "订货单统计数据"
+msgstr "采购订单统计"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -807,6 +813,7 @@ msgid ""
 "supplier invoice yet. Once you are ready to receive a supplier invoice, you "
 "can generate a draft supplier invoice based on the lines from this menu."
 msgstr ""
+"如果您设定采购订单的发票控制是”手动“。您能跟踪还没有收到供应商发票的所有采购订单的明细。一旦您收到供应商发票从这菜单您基于这些明细能生成发票草稿。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -817,19 +824,19 @@ msgstr "发票草稿"
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
 msgid "Manages analytic distribution and purchase orders."
-msgstr ""
+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 "这是计算手动采购单产品的最小计划日期"
+msgstr "这计算所有采购订单明细产品的最小计划日期"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8"
 
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
@@ -839,24 +846,24 @@ msgstr "采购申请"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "计量单位类别"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "交付日期"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "收货"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr "请料单"
+msgstr "需求单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -867,17 +874,17 @@ msgstr "发票列表"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "已确认采购订单要开发票"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr "图片"
+msgstr "图像"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "按用户每月的总订单明细"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -889,7 +896,7 @@ msgstr "月"
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "等该供应商回复"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -905,24 +912,24 @@ msgstr "等待审批的采购订单"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "总未完税金额"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr "已收货"
+msgstr "已接收"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "采购的产品"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr "从领料/提货中产生采购"
+msgstr "从采购中已生成装箱单"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -934,12 +941,18 @@ msgstr "采购管理"
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase
@@ -951,7 +964,7 @@ msgstr "税:"
 #: field:purchase.order,invoiced_rate:0
 #: field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "开发票"
+msgstr "已开票"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -963,12 +976,12 @@ msgstr "分类"
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr "采购单状态"
+msgstr "采购订单状态"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  年  "
 
 #. module: purchase
 #: field:purchase.report,state:0
@@ -990,7 +1003,7 @@ msgstr "采购订单明细"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "错误！您不能创建递归的相关成员。"
+msgstr "错误！您不能创建递归的相关业务伙伴。"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1000,23 +1013,23 @@ msgstr "日程表视图"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr "采购单合并"
+msgstr "采购订单合并"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr "问候"
+msgstr "尊敬的"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "供应商协商"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "采购属性"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1024,7 +1037,7 @@ 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 ""
+msgstr "一旦买方确认根据采购订单的发票控制，一个采购订单生成一个供应商发票，发票根据收到或订购的数量。"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1034,28 +1047,28 @@ msgstr "未完税金额"
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "这表明发票已支付"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "出仓产品要开发票"
 
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
 #: view:purchase.report:0
 msgid "Qty. per product"
-msgstr ""
+msgstr "Qty. per product"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "您尝试分配一个来自其它产品的批次"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -1070,12 +1083,12 @@ msgstr "销售与采购"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr "采购单列表"
+msgstr "采购订单"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1087,24 +1100,24 @@ msgstr "手工发票"
 #, python-format
 msgid ""
 "Somebody has just confirmed a purchase with an amount over the defined limit"
-msgstr ""
+msgstr "有人刚确认一个超过默认限制金额的采购"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤器..."
+msgstr "增加筛选条件"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:352
 #: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "未定义此产品“%s“ (id:%d)的费用科目"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:408
@@ -1116,12 +1129,12 @@ msgstr "您必须先取消掉附加到此采购订单上的所有发票。"
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr "请在此列表中选择多条待合并的订单"
+msgstr "请在此列表中选择多张待合并的订单"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "生成装箱单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1131,7 +1144,7 @@ msgstr "异常"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1152,6 +1165,14 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    采购模块是向供应商采购产品生成采购订单。\n"
+"    从采购订单创建供应商发票\n"
+"    采购管理的控制台包括：\n"
+"        当前的采购订单\n"
+"        每月的数量和金额图表    \n"
+"\n"
+"    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:685
@@ -1159,17 +1180,17 @@ msgstr ""
 msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
 "less."
-msgstr ""
+msgstr "这选定的供应商设定的最少采购数量为 %s，您不能采购少了。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1179,28 +1200,28 @@ msgstr "取消采购订单"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "必须为此产品赋予一个生产批次"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "生成装箱单跟踪入库的产品"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr "货品价值"
+msgstr "产品价值"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
 msgid "Pricelists Types"
-msgstr ""
+msgstr "价格表类型"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1212,7 +1233,7 @@ msgstr "报价单"
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
 #: view:purchase.report:0
 msgid "Purchase order per month"
-msgstr ""
+msgstr "每月的采购订单"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1222,18 +1243,18 @@ msgstr "日志"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "分类的产品"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "审批日期"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr "参考的文档生成这个采购订单请求"
+msgstr "相关文档生成这采购订单申请"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1245,8 +1266,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"采购订单或询价的状态.询价是一个采购订单的‘草稿’状态.订单被用户确定为‘已确认’状态.然后订单的供应商必须被确定这时状态改为为‘已审批通过’.当采购订单"
-"支付和已收货,状态变为‘完成’.如果在发票或接收产品时执行取消操作,状态将变为‘异常’."
+"采购订单或询价单的状态。\r\n"
+"    询价单是采购订单的‘草稿’状态。\r\n"
+"    订单被用户确确认为‘已确认’状态。\r\n"
+"    然后订单的供应商必须确认这时状态改为为‘已核准’。 \r\n"
+"    当采购订单支付和已收货状态变为‘完成’。\r\n"
+"    如果在开发票或接收产品时执行取消操作状态将变为‘异常’。"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1262,7 +1287,7 @@ msgstr "询价单"
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr "采购单被批准的日期"
+msgstr "采购订单核准的日期"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -1279,13 +1304,13 @@ msgstr "默认采购价格表版本"
 #: view:purchase.installer:0
 msgid ""
 "Extend your Purchases Management Application with additional functionalities."
-msgstr ""
+msgstr "扩展您采购管理的应用并增加功能"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
 #: view:purchase.installer:0
 msgid "Purchases Application Configuration"
-msgstr "采购管理应用程序配置"
+msgstr "采购管理应用程序设置"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -1306,7 +1331,7 @@ msgstr "发票"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1326,7 +1351,7 @@ msgstr "采购订单明细"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr "供应商批准该采购单。"
+msgstr "供应商核准了这采购订单。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1349,17 +1374,17 @@ msgstr "合并采购订单"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "采购订单明细产生发票"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "入库"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "按用户每月的订单总金额"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
@@ -1383,13 +1408,13 @@ msgstr "负责人"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr "订单参考"
+msgstr "我相关的订单"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr "搜索采购单"
+msgstr "搜索采购订单"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
@@ -1413,7 +1438,7 @@ msgstr "要求日期"
 #: field:purchase.order,date_approve:0
 #: field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr "通过日期"
+msgstr "已核准日期"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:407
@@ -1430,7 +1455,7 @@ msgstr "单价"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr "货运与开票"
+msgstr "交付 & 开发票"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1463,12 +1488,12 @@ msgstr "说明"
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "这是每个采购订单的交货周期/备用时间。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr "预期交货地址:"
+msgstr "预定交货地址:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1479,7 +1504,7 @@ msgstr "收货分析"
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "不含税金额"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1487,18 +1512,18 @@ msgid ""
 "Access your supplier records and maintain a good relationship with your "
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
-msgstr ""
+msgstr "访问您的供应商的记录与您的供应商保持良好的关系。通过日志标签您能跟踪您所有与供应商的互动：电子邮件，订单，会议等。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr "送货"
+msgstr "交付"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "询价请求"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1525,7 +1550,7 @@ msgstr "预定"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr "数量和金额的月汇总"
+msgstr "按月度的总数量和总金额"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:399
@@ -1538,28 +1563,28 @@ msgstr "无法取消采购订单！"
 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 ""
+msgstr "如果这产品没有供应商，买方可以手动填写并确认。这询价单能通过确认转换为采购订单。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Products Categories"
-msgstr ""
+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 ""
+msgstr "采购分析"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr "你订单参考"
+msgstr "你订单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1567,13 +1592,13 @@ msgstr "你订单参考"
 #: report:purchase.quotation:0
 #: field:purchase.report,expected_date:0
 msgid "Expected Date"
-msgstr "预计日期"
+msgstr "预定日期"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
 #: view:purchase.report:0
 msgid "Total price by product by state"
-msgstr ""
+msgstr "该状态下产品的总价格"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1584,7 +1609,7 @@ msgstr "增值税:"
 #: report:purchase.order:0
 #: field:purchase.order,date_order:0
 msgid "Date Ordered"
-msgstr "订购日期"
+msgstr "下单日期"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1599,12 +1624,12 @@ msgstr "采购控制"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1621,6 +1646,15 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" 请注意：\n"
+"订单将被合并如果：\n"
+"    * 采购订单在草稿状态\n"
+"    * 采购订单有相同的供应商\n"
+"    * 采购订单有相同的仓库库位，相同的价格表\n"
+"\n"
+"只合并明细如果：\n"
+"    * 订单明细刚好产品相同 \n"
+" "
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1631,7 +1665,7 @@ msgstr "年"
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "采购 - 标准单价"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1647,17 +1681,17 @@ msgstr "开票方式"
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr "通过"
+msgstr "核准"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr "待批准"
+msgstr "待核准"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr "发票"
+msgstr "开发票"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1670,12 +1704,16 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" “草稿”状态当采购订单在草稿状态是自动设置\n"
+"“确认”状态当采购订单在确认状态时自动设置为确认\n"
+"“完成”状态当采购订单完成自动设置\n"
+"“取消”状态当用户取消采购订单时自动设置"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:414
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr "采购单“%s”已经取消"
+msgstr "采购订单 “%s” 已经取消"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1702,12 +1740,12 @@ msgstr "你确定要合并此订单吗？"
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr "分组于"
+msgstr "分组..."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "从采购订单"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1717,12 +1755,12 @@ msgstr "增值税:"
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr "总价"
+msgstr "总金额"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5"
 
 #. module: purchase
 #: field:res.company,po_lead:0
@@ -1735,7 +1773,7 @@ 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 ""
+msgstr "如果采购订单的发票控制是“来自订单”发票是自动生成。发票也可以由会计人员手动产生(发票控制 = 手动)"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -1755,16 +1793,18 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"您必须在采购订单里选择业务伙伴！\n"
+"请在选定产品前设定一个业务伙伴"
 
 #. module: purchase
 #: view:purchase.installer:0
 msgid "title"
-msgstr ""
+msgstr "标题"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_move
 msgid "Partial Move"
-msgstr ""
+msgstr "部分调拨"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1775,7 +1815,7 @@ msgstr "库存调拨"
 #: 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 ""
+msgstr "计量单位"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1787,13 +1827,13 @@ msgstr "订单"
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "采购订单唯一的编号，在采购订单生成时计算"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "采购控制台"
 
 #~ msgid "Purchase Process"
 #~ msgstr "采购流程"
@@ -1978,3 +2018,9 @@ msgstr ""
 
 #~ msgid "Product UoM"
 #~ msgstr "货品计量单位"
+
+#~ msgid "From Picking"
+#~ msgstr "来自装箱单"
+
+#~ msgid "Purchase Lines Not Invoiced"
+#~ msgstr "采购明细没开发票"
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index c108b4f7ecd..480ae47ab84 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/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: 2011-04-29 04:53+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -69,7 +69,7 @@ msgstr ""
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid "From Picking"
+msgid "From Reception"
 msgstr ""
 
 #. module: purchase
@@ -739,7 +739,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "询价单"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -937,7 +937,13 @@ 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 "Purchase Lines Not Invoiced"
+msgid "On Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid "On Receptions"
 msgstr ""
 
 #. module: purchase

From e766d1892f3c3aaacebef4c180794c2757bffffc Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" 
Date: Thu, 28 Jul 2011 10:49:53 +0530
Subject: [PATCH 112/167] In css the convention is to prepend all css
 declarations with .openerp.

bzr revid: ysa@tinyerp.com-20110728051953-cpjaae65bgrfr8cf
---
 addons/base/static/src/css/export.css | 34 +++++++++++++--------------
 addons/base/static/src/js/export.js   | 18 +++++++-------
 addons/base/static/src/xml/base.xml   | 28 +++++++++++-----------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/addons/base/static/src/css/export.css b/addons/base/static/src/css/export.css
index 051b5cb076c..13dfc3d5a3f 100644
--- a/addons/base/static/src/css/export.css
+++ b/addons/base/static/src/css/export.css
@@ -1,56 +1,56 @@
-.row tr{
+.openerp .oe_export_row tr{
     background-color: #FFFFFF;
     font-size: 0.8em;
     height: 22px;
 }
 
-tr.ui-selected td {
+.openerp tr.ui-selected td {
     background-color: #CCCCCC;
 }
 
-.requiredfield {
+.openerp .oe_export_requiredfield {
     background-color: #D2D2FF;
 }
 
-.readonlyfield{
-    background-color: DarkGray;
+.openerp .oe_export_readonlyfield{
+    background-color: #999999;
 }
 
-.row:hover{
+.openerp .oe_export_row:hover{
     background-color: #F3F3F3;
 }
 
-.fields-selector-export {
+.openerp .oe_export_fields_selector_export {
     width: 100%;
     height: 400px;
 }
 
-.fields-selector-left {
+.openerp .oe_export_fields_selector_left {
     width: 50%;
 }
 
-div#left_field_panel {
+.openerp div#left_field_panel {
     overflow: scroll;
     width: 100%;
     height: 400px;
     border: solid #999999 1px;
 }
 
-.fields-selector-center {
+.openerp .oe_export_fields_selector_center {
     width: 102px;
 }
 
-.fields-selector-right {
+.openerp .oe_export_fields_selector_right {
     width: 45%;
     height: 400px;
 }
 
-.fields-selector-export select{
+.openerp .oe_export_fields_selector_export select{
     width: 100%;
     height: 100%;
 }
 
-.tree_header{
+.openerp .oe_export_tree_header{
     border: 0.5px solid #E3E3E3;
     text-align: left;
     white-space: nowrap;
@@ -59,7 +59,7 @@ div#left_field_panel {
 }
 
 
-table.tree-grid{
+.openerp table.tree_grid{
     border: 1px solid #E3E3E3;
     text-align: left;
     white-space: nowrap;
@@ -68,17 +68,17 @@ table.tree-grid{
     width: 100%;
 }
 
-table.tree-grid a:hover {
+.openerp table.tree_grid a:hover {
     color: blue;
     border: none;
 }
 
-table.tree-grid a {
+.openerp table.tree_grid a {
     color: #5F5C5C;
     border: none;
 }
 
-.button-export {
+.openerp .oe_export_button_export {
 	border: 1px solid #006;
 	background-color: #F3F3F3;
 }
diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/export.js
index ff8e8604348..8fe42f900d1 100644
--- a/addons/base/static/src/js/export.js
+++ b/addons/base/static/src/js/export.js
@@ -207,11 +207,11 @@ openerp.base.Export = openerp.base.Dialog.extend({
         _.each(result, function(record) {
             if((record.field_type == "one2many") && imp_cmpt){
                 var o2m_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column');
-                o2m_fld.addClass("readonlyfield");
+                o2m_fld.addClass("oe_export_readonlyfield");
             }
             if ((record.required == true) || record.required == "True"){
                 var required_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column');
-                required_fld.addClass("requiredfield");
+                required_fld.addClass("oe_export_requiredfield");
             }
             $("img[id='parentimg-" + record.id +"']").click(function(){
                 self.on_click(this.id, result);
@@ -228,14 +228,14 @@ openerp.base.Export = openerp.base.Dialog.extend({
                         if (this.rowIndex >=self.row_index){
                             for (i = (self.row_index-1); i < this.rowIndex; i++) {
                                 scnd_click = $("tr[id^='treerow-']")[i];
-                                if(!$(scnd_click).find('#tree-column').hasClass("readonlyfield")){
+                                if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
                         }else{
                             for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
                                 scnd_click = $("tr[id^='treerow-']")[i];
-                                if(!$(scnd_click).find('#tree-column').hasClass("readonlyfield")){
+                                if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
@@ -248,7 +248,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
                         self.row_index = 0;
                 });
                 var o2m_selection = $("tr[id='treerow-" + record.id + "']").find('#tree-column');
-                if ($(o2m_selection).hasClass("readonlyfield")){
+                if ($(o2m_selection).hasClass("oe_export_readonlyfield")){
                     return false;
                 }
                 var selected = $("tr.ui-selected");
@@ -287,7 +287,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
                         while($(elem).prev().is(":visible") == false){
                             elem = $(elem).prev();
                         }
-                        if(!$(elem).prev().find('#tree-column').hasClass("readonlyfield")){
+                        if(!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")){
                             $(elem).prev().addClass("ui-selected");
                         }
                         $(elem).prev().find('a').focus();
@@ -303,7 +303,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
                         while($(elem).next().is(":visible") == false){
                             elem = $(elem).next();
                         }
-                        if(!$(elem).next().find('#tree-column').hasClass("readonlyfield")){
+                        if(!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")){
                             $(elem).next().addClass("ui-selected");
                         }
                         $(elem).next().find('a').focus();
@@ -312,7 +312,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
             });
             $("tr[id='treerow-" + record.id + "']").dblclick(function (e) {
                 var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column');
-                if (! $(o2m_selection).hasClass("readonlyfield")){
+                if (! $(o2m_selection).hasClass("oe_export_readonlyfield")){
                     var field_id =  $(this).find("a").attr("id");
                     if(field_id){
                        self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"))
@@ -325,7 +325,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
                 if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){
                     field_id = event.relatedTarget.attributes["id"]["value"]
                     if (field_id && field_id.split("-")[0] == 'export'){
-                        if(!$("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("readonlyfield")){
+                        if(!$("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")){
                             self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]);
                         }
                     }
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 89e23fece6d..1c35ce9a06d 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -983,7 +983,7 @@
 
         
    
             
-                
+                
    
@@ -994,30 +994,30 @@
                         
-                        
-                        
@@ -1028,17 +1028,17 @@
 
-    
    
                     
    
                         Available fields
                         
                     
    
                     
    
+                        
                             
    
                             
    
                             		
                         
-                            
+                            
    
                                 
    
                                     
-                                        
+                                        
                                     
                                 
    
                                 
    
                                     
-                                        
+                                        
                                     
                                 
    
                                 
    
                                     
-                                        
+                                        
                                     
                                 
    
                             
    
                             		
+                        
                             
                         
                     
    
 
 
    
-        
+    
     Name 
    
+        
     
     Name 
    
         
    
 
 
     
-        
    
             
-                
-                    
+                
    
+                    
                             
                                 
@@ -1067,7 +1067,7 @@
     
-        
+        
 
@@ -1082,7 +1082,7 @@
                 
-        
+        

From 4a321d51d83ff85d81c987eca16e0c01da7bbbea Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" 
Date: Thu, 28 Jul 2011 12:11:54 +0530
Subject: [PATCH 113/167] [IMP] Improve jquery selector use this. instead of
 directly $.

bzr revid: ysa@tinyerp.com-20110728064154-t3k2fcfss4e1g6kk
---
 addons/base/static/src/js/export.js | 130 ++++++++++++++--------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/export.js
index 8fe42f900d1..cec141aefcd 100644
--- a/addons/base/static/src/js/export.js
+++ b/addons/base/static/src/js/export.js
@@ -30,38 +30,38 @@ openerp.base.Export = openerp.base.Dialog.extend({
                        },
                     close: function(event, ui){ self.close();}
                    });
-        this.on_show_exists_export_list();
-        jQuery(this.$dialog).removeClass('ui-dialog-content ui-widget-content');
-        $('#add_field').click(function(){
+        self.on_show_exists_export_list();
+        jQuery(self.$dialog).removeClass('ui-dialog-content ui-widget-content');
+        self.$element.find('#add_field').click(function(){
             if($("#field-tree-structure tr.ui-selected")){
-                var fld = $("#field-tree-structure tr.ui-selected").find('a');
+                var fld = self.$element.find("#field-tree-structure tr.ui-selected").find('a');
                 for (var i=0;i 0){
-                        $("#saved_export_list").append( new Option(value, exp_id));
+                    if(self.$element.find("#saved_export_list").length > 0){
+                        self.$element.find("#saved_export_list").append( new Option(value, exp_id));
                     }
                     else{
                         self.on_show_exists_export_list();
                     }
-                    if($("#saved_export_list").is(":hidden")){
+                    if(self.$element.find("#saved_export_list").is(":hidden")){
                         self.on_show_exists_export_list();
                     }
                 }
             });
             self.on_show_save_list()
-            $("#fields_list option").remove();
+            self.$element.find("#fields_list option").remove();
         }
     },
 
@@ -165,8 +166,8 @@ openerp.base.Export = openerp.base.Dialog.extend({
                 prefix = record['params']['prefix']
                 name = record['params']['name']
                 $(record['children']).each (function(e, childid) {
-                    if ($("tr[id='treerow-" + childid +"']").length > 0) {
-                        if ($("tr[id='treerow-" + childid +"']").is(':hidden')) {
+                    if (self.$element.find("tr[id='treerow-" + childid +"']").length > 0) {
+                        if (self.$element.find("tr[id='treerow-" + childid +"']").is(':hidden')) {
                             is_loaded = -1;
                         } else {
                             is_loaded++;
@@ -174,9 +175,9 @@ openerp.base.Export = openerp.base.Dialog.extend({
                     }
                 });
                 if (is_loaded == 0) {
-                    if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') {
+                    if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') {
                         if (model){
-                            import_comp = $("#import_compat option:selected").val()
+                            import_comp = self.$element.find("#import_compat option:selected").val()
                             var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']}
                             self.rpc("/base/export/get_fields", {"model": model, "prefix": prefix, "name": name,  "field_parent" : self.field_id, "params":params}, function (results) {
                                 self.on_show_data(results);
@@ -189,52 +190,51 @@ openerp.base.Export = openerp.base.Dialog.extend({
                     self.showcontent(self.field_id, false);
                 }
             }
-
         });
     },
 
     on_show_data: function(result) {
         var self = this;
-        var imp_cmpt = parseInt($("#import_compat option:selected").val());
-        var current_tr = $("tr[id='treerow-" + self.field_id + "']");
+        var imp_cmpt = parseInt(self.$element.find("#import_compat option:selected").val());
+        var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
         if (current_tr.length >= 1){
             current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');
             current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
         }
         else{
-            $('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary',  {'fields': result}));
+            self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary',  {'fields': result}));
         }
         _.each(result, function(record) {
             if((record.field_type == "one2many") && imp_cmpt){
-                var o2m_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column');
+                var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 o2m_fld.addClass("oe_export_readonlyfield");
             }
             if ((record.required == true) || record.required == "True"){
-                var required_fld = $("tr[id='treerow-" + record.id + "']").find('#tree-column');
+                var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 required_fld.addClass("oe_export_requiredfield");
             }
-            $("img[id='parentimg-" + record.id +"']").click(function(){
+            self.$element.find("img[id='parentimg-" + record.id +"']").click(function(){
                 self.on_click(this.id, result);
             });
 
-            $("tr[id='treerow-" + record.id + "']").click(function(e){
+            self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e){
                 if (e.shiftKey == true){
                     var frst_click,scnd_click = '';
                     if (self.row_index == 0){
                         self.row_index = this.rowIndex;
-                        frst_click = $("tr[id^='treerow-']")[self.row_index-1];
+                        frst_click = self.$element.find("tr[id^='treerow-']")[self.row_index-1];
                         $(frst_click).addClass("ui-selected");
                     }else{
                         if (this.rowIndex >=self.row_index){
                             for (i = (self.row_index-1); i < this.rowIndex; i++) {
-                                scnd_click = $("tr[id^='treerow-']")[i];
+                                scnd_click = self.$element.find("tr[id^='treerow-']")[i];
                                 if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
                         }else{
                             for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
-                                scnd_click = $("tr[id^='treerow-']")[i];
+                                scnd_click = self.$element.find("tr[id^='treerow-']")[i];
                                 if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
                                     $(scnd_click).addClass("ui-selected");
                                 }
@@ -244,14 +244,14 @@ openerp.base.Export = openerp.base.Dialog.extend({
                 }
                 self.row_index = this.rowIndex;
 
-                $("tr[id='treerow-" + record.id + "']").keyup(function (e) {
+                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function (e) {
                         self.row_index = 0;
                 });
-                var o2m_selection = $("tr[id='treerow-" + record.id + "']").find('#tree-column');
+                var o2m_selection = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 if ($(o2m_selection).hasClass("oe_export_readonlyfield")){
                     return false;
                 }
-                var selected = $("tr.ui-selected");
+                var selected = self.$element.find("tr.ui-selected");
                 if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)){
                     $(this).find('a').blur();
                     $(this).removeClass("ui-selected");
@@ -272,7 +272,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
                 return false;
             });
 
-            $("tr[id='treerow-" + record.id + "']").keydown(function (e) {
+            self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function (e) {
                 var keyCode = e.keyCode || e.which;
                 arrow = {left: 37, up: 38, right: 39, down: 40 };
                 switch (keyCode) {
@@ -310,8 +310,8 @@ openerp.base.Export = openerp.base.Dialog.extend({
                     break;
                 }
             });
-            $("tr[id='treerow-" + record.id + "']").dblclick(function (e) {
-                var o2m_selection = $("tr[id^='treerow-" + record.id + "']").find('#tree-column');
+            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function (e) {
+                var o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
                 if (! $(o2m_selection).hasClass("oe_export_readonlyfield")){
                     var field_id =  $(this).find("a").attr("id");
                     if(field_id){
@@ -320,12 +320,12 @@ openerp.base.Export = openerp.base.Dialog.extend({
                 }
             });
         });
-        $('#fields_list').mouseover(function(event){
+        self.$element.find('#fields_list').mouseover(function(event){
             if(event.relatedTarget){
                 if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){
                     field_id = event.relatedTarget.attributes["id"]["value"]
                     if (field_id && field_id.split("-")[0] == 'export'){
-                        if(!$("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")){
+                        if(!self.$element.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")){
                             self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]);
                         }
                     }
@@ -336,14 +336,14 @@ openerp.base.Export = openerp.base.Dialog.extend({
 
     // show & hide the contents
     showcontent: function (id, flag) {
-        var first_child = $("tr[id='treerow-" + id + "']").find('img')
+        var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img')
         if (flag) {
             first_child.attr('src', '/base/static/src/img/expand.gif');
         }
         else {
             first_child.attr('src', '/base/static/src/img/collapse.gif');
         }
-        var child_field = $("tr[id^='treerow-" + id +"/']")
+        var child_field = this.$element.find("tr[id^='treerow-" + id +"/']")
         var child_len = (id.split("/")).length + 1
         for (var i = 0; i < child_field.length; i++) {
             if (flag) {
@@ -361,15 +361,15 @@ openerp.base.Export = openerp.base.Dialog.extend({
     },
 
     add_field: function(field_id, string) {
-        var field_list = $('#fields_list')
-        if ( $("#fields_list option[value='" + field_id + "']") && !$("#fields_list option[value='" + field_id + "']").length){
+        var field_list = this.$element.find('#fields_list')
+        if ( this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length){
             field_list.append( new Option(string, field_id));
         }
     },
 
     get_fields: function (){
         var export_field = [];
-        $("#fields_list option").each(function(){
+        this.$element.find("#fields_list option").each(function(){
             export_field.push(jQuery(this).val());
         });
         if (! export_field.length){
@@ -381,7 +381,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
         var self = this;
         var export_field = {};
         var flag = true;
-        $("#fields_list option").each(function(){
+        self.$element.find("#fields_list option").each(function(){
             export_field[jQuery(this).val()] = jQuery(this).text();
             flag = false;
         });
@@ -390,8 +390,8 @@ openerp.base.Export = openerp.base.Dialog.extend({
             return;
         }
 
-        import_comp = $("#import_compat option:selected").val()
-        export_format = $("#export_format").val()
+        import_comp = self.$element.find("#import_compat option:selected").val()
+        export_format = self.$element.find("#export_format").val()
 
         self.rpc("/base/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){
             window.location="data:text/csv/excel;charset=utf8," + data

From cf877c60ee43456828c46f8a49572e2583e96fdf Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" 
Date: Thu, 28 Jul 2011 12:49:54 +0530
Subject: [PATCH 114/167] [IMP] improve css of tree_grid a tag.

bzr revid: ysa@tinyerp.com-20110728071954-gpan09gff3xhy4e8
---
 addons/base/static/src/css/export.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base/static/src/css/export.css b/addons/base/static/src/css/export.css
index 13dfc3d5a3f..7b4b9707b39 100644
--- a/addons/base/static/src/css/export.css
+++ b/addons/base/static/src/css/export.css
@@ -76,6 +76,7 @@
 .openerp table.tree_grid a {
     color: #5F5C5C;
     border: none;
+    display: block;
 }
 
 .openerp .oe_export_button_export {

From 0b04e6fa34b278689e9f22a4446a12161ea05a06 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi 
Date: Thu, 28 Jul 2011 13:20:13 +0200
Subject: [PATCH 115/167] [FIX] Renamed export module to data_export. export is
 a javascript reserved word thus causing problems with safari

bzr revid: fme@openerp.com-20110728112013-lmo06h75r0xqipbo
---
 addons/base/__openerp__.py                                 | 4 ++--
 addons/base/static/src/css/{export.css => data_export.css} | 0
 addons/base/static/src/js/boot.js                          | 4 ++--
 addons/base/static/src/js/{export.js => data_export.js}    | 4 ++--
 addons/base/static/src/js/views.js                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename addons/base/static/src/css/{export.css => data_export.css} (100%)
 rename addons/base/static/src/js/{export.js => data_export.js} (99%)

diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index 01d712ef41e..c8c80cd2e3a 100644
--- a/addons/base/__openerp__.py
+++ b/addons/base/__openerp__.py
@@ -28,13 +28,13 @@
         "static/src/js/list-editable.js",
         "static/src/js/search.js",
         "static/src/js/view_tree.js",
-        "static/src/js/export.js",
+        "static/src/js/data_export.js",
     ],
     'css' : [
         "static/lib/jquery.superfish/css/superfish.css",
         "static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css",
         "static/lib/jquery.ui.notify/css/ui.notify.css",
         "static/src/css/base.css",
-        "static/src/css/export.css",
+        "static/src/css/data_export.css",
     ],
 }
diff --git a/addons/base/static/src/css/export.css b/addons/base/static/src/css/data_export.css
similarity index 100%
rename from addons/base/static/src/css/export.css
rename to addons/base/static/src/css/data_export.css
diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js
index 25ab0bda632..5f86a73ed5e 100644
--- a/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@ -86,8 +86,8 @@ openerp.base = function(instance) {
     if (openerp.base.view_tree) {
         openerp.base.view_tree(instance);
     }
-    if (openerp.base.export) {
-        openerp.base.export(instance);
+    if (openerp.base.data_export) {
+        openerp.base.data_export(instance);
     }
 };
 
diff --git a/addons/base/static/src/js/export.js b/addons/base/static/src/js/data_export.js
similarity index 99%
rename from addons/base/static/src/js/export.js
rename to addons/base/static/src/js/data_export.js
index cec141aefcd..9a04dbf4c4e 100644
--- a/addons/base/static/src/js/export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,5 +1,5 @@
-openerp.base.export = function(openerp) {
-openerp.base.Export = openerp.base.Dialog.extend({
+openerp.base.data_export = function(openerp) {
+openerp.base.DataExport = openerp.base.Dialog.extend({
     init: function(parent, dataset, views){
         this._super(parent);
         this.dataset = dataset
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index d25e34a26f4..36fce76d40c 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -222,7 +222,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             if(this.active_view == 'list' || this.active_view == 'form') {
                 this.views[this.active_view].controller.$element.after(QWeb.render('ExportView'))
                 this.$element.find('#exportview').click(function(ev) {
-                    var export_view = new openerp.base.Export(self, self.dataset, self.views);
+                    var export_view = new openerp.base.DataExport(self, self.dataset, self.views);
                     export_view.start(false);
                     ev.preventDefault();
                 });

From 8b095a3b1ea0a740388a31d5f3f89701ff7130d3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi 
Date: Thu, 28 Jul 2011 14:26:50 +0200
Subject: [PATCH 116/167] [IMP] Cleaned a bit, fixed some global variables

bzr revid: fme@openerp.com-20110728122650-8305oh329y5y8a66
---
 addons/base/static/src/js/data_export.js | 375 ++++++++++++-----------
 1 file changed, 188 insertions(+), 187 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 9a04dbf4c4e..50a08bc4f12 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,95 +1,98 @@
 openerp.base.data_export = function(openerp) {
 openerp.base.DataExport = openerp.base.Dialog.extend({
-    init: function(parent, dataset, views){
+    init: function(parent, dataset, views) {
         this._super(parent);
-        this.dataset = dataset
-        this.views = views
+        this.dataset = dataset;
+        this.views = views;
         this.views_id = {};
         for (var key in this.views) {
-            this.views_id[key] = this.views[key].view_id
+            this.views_id[key] = this.views[key].view_id;
         }
     },
-
     start: function() {
-        var self = this
+        var self = this;
         self._super(false);
         self.template = 'ExportTreeView';
-        self.dialog_title = "Export Data "
+        self.dialog_title = "Export Data";
         self.open({
-                    modal: true,
-                    width: '55%',
-                    height: 'auto',
-                    position: 'top',
-                    buttons : {
-                        "Close" : function() {
-                            self.close();
-                          },
-                        "Export To File" : function() {
-                            self.on_click_export_data();
-                          }
-                       },
-                    close: function(event, ui){ self.close();}
-                   });
+            modal: true,
+            width: '55%',
+            height: 'auto',
+            position: 'top',
+            buttons : {
+                "Close" : function() {
+                    self.close();
+                  },
+                "Export To File" : function() {
+                    self.on_click_export_data();
+                  }
+               },
+            close: function(event, ui){ self.close();}
+        });
         self.on_show_exists_export_list();
-        jQuery(self.$dialog).removeClass('ui-dialog-content ui-widget-content');
-        self.$element.find('#add_field').click(function(){
-            if($("#field-tree-structure tr.ui-selected")){
-                var fld = self.$element.find("#field-tree-structure tr.ui-selected").find('a');
-                for (var i=0;i 0){
-                        self.$element.find("#saved_export_list").append( new Option(value, exp_id));
-                    }
-                    else{
+        var export_field = self.get_fields();
+        if (export_field.length) {
+            self.rpc("/base/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id) {
+                if (exp_id) {
+                    if (self.$element.find("#saved_export_list").length > 0) {
+                        self.$element.find("#saved_export_list").append(new Option(value, exp_id));
+                    } else {
                         self.on_show_exists_export_list();
                     }
-                    if(self.$element.find("#saved_export_list").is(":hidden")){
+                    if (self.$element.find("#saved_export_list").is(":hidden")) {
                         self.on_show_exists_export_list();
                     }
                 }
             });
-            self.on_show_save_list()
+            self.on_show_save_list();
             self.$element.find("#fields_list option").remove();
         }
     },
-
     on_click: function(id, result) {
-        var self = this
+        var self = this;
         self.field_id = id.split("-")[1];
-        var model = ''
-        var prefix = ''
-        var name = ''
         var is_loaded = 0;
         _.each(result, function(record) {
-            if(record['id'] == self.field_id && (record['children']).length >= 1){
-                model = record['params']['model']
-                prefix = record['params']['prefix']
-                name = record['params']['name']
-                $(record['children']).each (function(e, childid) {
-                    if (self.$element.find("tr[id='treerow-" + childid +"']").length > 0) {
-                        if (self.$element.find("tr[id='treerow-" + childid +"']").is(':hidden')) {
+            if (record['id'] == self.field_id && (record['children']).length >= 1) {
+                var model = record['params']['model'],
+                    prefix = record['params']['prefix'],
+                    name = record['params']['name'];
+                $(record['children']).each(function(e, childid) {
+                    if (self.$element.find("tr[id='treerow-" + childid + "']").length > 0) {
+                        if (self.$element.find("tr[id='treerow-" + childid + "']").is(':hidden')) {
                             is_loaded = -1;
                         } else {
                             is_loaded++;
@@ -175,11 +167,21 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                     }
                 });
                 if (is_loaded == 0) {
-                    if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') {
-                        if (model){
-                            import_comp = self.$element.find("#import_compat option:selected").val()
-                            var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']}
-                            self.rpc("/base/export/get_fields", {"model": model, "prefix": prefix, "name": name,  "field_parent" : self.field_id, "params":params}, function (results) {
+                    if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
+                        if (model) {
+                            var import_comp = self.$element.find("#import_compat option:selected").val();
+                            var params = {
+                                import_compat: parseInt(import_comp),
+                                views_id: self.views_id,
+                                parent_field_type : record['field_type']
+                            }
+                            self.rpc("/base/export/get_fields", {
+                                model: model,
+                                prefix: prefix,
+                                name: name,
+                                field_parent : self.field_id,
+                                params: params
+                            }, function(results) {
                                 self.on_show_data(results);
                             });
                         }
@@ -192,50 +194,48 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             }
         });
     },
-
     on_show_data: function(result) {
         var self = this;
         var imp_cmpt = parseInt(self.$element.find("#import_compat option:selected").val());
         var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
-        if (current_tr.length >= 1){
+        if (current_tr.length >= 1) {
             current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');
             current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
-        }
-        else{
-            self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary',  {'fields': result}));
+        } else {
+            self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result}));
         }
         _.each(result, function(record) {
-            if((record.field_type == "one2many") && imp_cmpt){
+            if ((record.field_type == "one2many") && imp_cmpt) {
                 var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 o2m_fld.addClass("oe_export_readonlyfield");
             }
-            if ((record.required == true) || record.required == "True"){
+            if ((record.required == true) || record.required == "True") {
                 var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 required_fld.addClass("oe_export_requiredfield");
             }
-            self.$element.find("img[id='parentimg-" + record.id +"']").click(function(){
+            self.$element.find("img[id='parentimg-" + record.id +"']").click(function() {
                 self.on_click(this.id, result);
             });
 
-            self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e){
-                if (e.shiftKey == true){
-                    var frst_click,scnd_click = '';
-                    if (self.row_index == 0){
+            self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e) {
+                if (e.shiftKey == true) {
+                    var frst_click, scnd_click = '';
+                    if (self.row_index == 0) {
                         self.row_index = this.rowIndex;
                         frst_click = self.$element.find("tr[id^='treerow-']")[self.row_index-1];
                         $(frst_click).addClass("ui-selected");
-                    }else{
-                        if (this.rowIndex >=self.row_index){
+                    } else {
+                        if (this.rowIndex >=self.row_index) {
                             for (i = (self.row_index-1); i < this.rowIndex; i++) {
                                 scnd_click = self.$element.find("tr[id^='treerow-']")[i];
-                                if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
+                                if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
-                        }else{
+                        } else {
                             for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
                                 scnd_click = self.$element.find("tr[id^='treerow-']")[i];
-                                if(!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")){
+                                if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
@@ -244,88 +244,88 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 }
                 self.row_index = this.rowIndex;
 
-                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function (e) {
-                        self.row_index = 0;
+                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function(e) {
+                    self.row_index = 0;
                 });
                 var o2m_selection = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
-                if ($(o2m_selection).hasClass("oe_export_readonlyfield")){
+                if ($(o2m_selection).hasClass("oe_export_readonlyfield")) {
                     return false;
                 }
                 var selected = self.$element.find("tr.ui-selected");
-                if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)){
+                if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
                     $(this).find('a').blur();
                     $(this).removeClass("ui-selected");
-                }else if($(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)){
+                } else if ($(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
                     selected.find('a').blur();
                     selected.removeClass("ui-selected");
                     $(this).find('a').focus();
                     $(this).addClass("ui-selected");
-                }else if(!$(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)){
+                } else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
                     selected.find('a').blur();
                     selected.removeClass("ui-selected");
                     $(this).find('a').focus();
                     $(this).addClass("ui-selected");
-                }else if(!$(this).hasClass("ui-selected") && (e.ctrlKey == true)){
+                } else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
                     $(this).find('a').focus();
                     $(this).addClass("ui-selected");
                 }
                 return false;
             });
 
-            self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function (e) {
+            self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function(e) {
                 var keyCode = e.keyCode || e.which;
                 arrow = {left: 37, up: 38, right: 39, down: 40 };
                 switch (keyCode) {
                     case arrow.left:
-                        if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){
+                        if ($(this).find('img').attr('src') === '/base/static/src/img/collapse.gif') {
                             self.on_click(this.id, result);
                         }
-                    break;
+                        break;
                     case arrow.up:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
-                        while($(elem).prev().is(":visible") == false){
+                        while ($(elem).prev().is(":visible") == false) {
                             elem = $(elem).prev();
                         }
-                        if(!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")){
+                        if (!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")) {
                             $(elem).prev().addClass("ui-selected");
                         }
                         $(elem).prev().find('a').focus();
-                    break;
+                        break;
                     case arrow.right:
-                        if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){
+                        if ($(this).find('img').attr('src') == '/base/static/src/img/expand.gif') {
                             self.on_click(this.id, result);
                         }
-                    break;
+                        break;
                     case arrow.down:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
-                        while($(elem).next().is(":visible") == false){
+                        while($(elem).next().is(":visible") == false) {
                             elem = $(elem).next();
                         }
-                        if(!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")){
+                        if (!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")) {
                             $(elem).next().addClass("ui-selected");
                         }
                         $(elem).next().find('a').focus();
-                    break;
+                        break;
                 }
             });
-            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function (e) {
-                var o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
-                if (! $(o2m_selection).hasClass("oe_export_readonlyfield")){
-                    var field_id =  $(this).find("a").attr("id");
-                    if(field_id){
-                       self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"))
+            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function(e) {
+                var $o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
+                if (!$o2m_selection.hasClass("oe_export_readonlyfield")) {
+                    var field_id = $(this).find("a").attr("id");
+                    if (field_id) {
+                       self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"));
                    }
                 }
             });
         });
-        self.$element.find('#fields_list').mouseover(function(event){
-            if(event.relatedTarget){
-                if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']){
-                    field_id = event.relatedTarget.attributes["id"]["value"]
-                    if (field_id && field_id.split("-")[0] == 'export'){
-                        if(!self.$element.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")){
+        self.$element.find('#fields_list').mouseover(function(event) {
+            if (event.relatedTarget) {
+                if (event.relatedTarget.attributes['id'] && event.relatedTarget.attributes['string']) {
+                    var field_id = event.relatedTarget.attributes["id"]["value"];
+                    if (field_id && field_id.split("-")[0] === 'export') {
+                        if (!self.$element.find("tr[id='treerow-" + field_id.split("-")[1] + "']").find('#tree-column').hasClass("oe_export_readonlyfield")) {
                             self.add_field(field_id.split("-")[1], event.relatedTarget.attributes["string"]["value"]);
                         }
                     }
@@ -333,77 +333,78 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             }
         });
     },
-
-    // show & hide the contents
-    showcontent: function (id, flag) {
-        var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img')
+    showcontent: function(id, flag) {
+        // show & hide the contents
+        var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img');
         if (flag) {
             first_child.attr('src', '/base/static/src/img/expand.gif');
         }
         else {
             first_child.attr('src', '/base/static/src/img/collapse.gif');
         }
-        var child_field = this.$element.find("tr[id^='treerow-" + id +"/']")
-        var child_len = (id.split("/")).length + 1
+        var child_field = this.$element.find("tr[id^='treerow-" + id +"/']");
+        var child_len = (id.split("/")).length + 1;
         for (var i = 0; i < child_field.length; i++) {
             if (flag) {
                 $(child_field[i]).hide();
-            }
-            else {
-                if(child_len ==  (child_field[i].id.split("/")).length){
-                    if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){
-                        jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif')
+            } else {
+                if (child_len == (child_field[i].id.split("/")).length) {
+                    if ($(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif') {
+                        $(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif');
                     }
                     $(child_field[i]).show();
                 }
             }
         }
     },
-
     add_field: function(field_id, string) {
-        var field_list = this.$element.find('#fields_list')
-        if ( this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length){
-            field_list.append( new Option(string, field_id));
+        var field_list = this.$element.find('#fields_list');
+        if (this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length) {
+            field_list.append(new Option(string, field_id));
         }
     },
-
-    get_fields: function (){
+    get_fields: function() {
         var export_field = [];
-        this.$element.find("#fields_list option").each(function(){
-            export_field.push(jQuery(this).val());
+        this.$element.find("#fields_list option").each(function() {
+            export_field.push($(this).val());
         });
-        if (! export_field.length){
+        if (!export_field.length) {
             alert('Please select fields to save export list...');
         }
         return export_field;
     },
-    on_click_export_data: function(){
+    on_click_export_data: function() {
         var self = this;
         var export_field = {};
         var flag = true;
-        self.$element.find("#fields_list option").each(function(){
-            export_field[jQuery(this).val()] = jQuery(this).text();
+        self.$element.find("#fields_list option").each(function() {
+            export_field[$(this).val()] = $(this).text();
             flag = false;
         });
-        if (flag){
+        if (flag) {
             alert('Please select fields to export...');
             return;
         }
 
-        import_comp = self.$element.find("#import_compat option:selected").val()
-        export_format = self.$element.find("#export_format").val()
+        var import_comp = self.$element.find("#import_compat option:selected").val(),
+            export_format = self.$element.find("#export_format").val();
 
-        self.rpc("/base/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){
-            window.location="data:text/csv/excel;charset=utf8," + data
+        self.rpc("/base/export/export_data", {
+            model: self.dataset.model,
+            fields: export_field,
+            ids: self.dataset.ids,
+            domain: self.dataset.domain,
+            import_compat: parseInt(import_comp),
+            export_format: export_format
+        }, function(data) {
+            window.location = "data:text/csv/excel;charset=utf8," + data;
             self.close();
         });
     },
-
     close: function() {
-        jQuery(this.$dialog).remove();
+        $(this.$dialog).remove();
         this._super();
-    },
-
+    }
 });
 
 };

From ccb48c8f4b2bab8345e1e80379b54b2f093954e8 Mon Sep 17 00:00:00 2001
From: niv-openerp 
Date: Thu, 28 Jul 2011 16:34:13 +0200
Subject: [PATCH 117/167] [imp] changed a lot of things in controller but stick
 with retro-compatibility

bzr revid: nicolas.vanhoren@openerp.com-20110728143413-7z0an78q6k5ytsiy
---
 addons/base/static/src/js/controller.js | 468 ++++++------------------
 addons/base/static/src/js/search.js     |  25 +-
 2 files changed, 126 insertions(+), 367 deletions(-)

diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index 1a13ab18607..a9bf99f8764 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -148,44 +148,118 @@ instance.base.generate_null_object_class = function(claz, add) {
 // --------------------------------------------------------
 // OLD 
 // --------------------------------------------------------
-
 /**
- * OpenERP Controller
- * TODO merge BaseWidget with Controller
+ * Class for OpenERP session aware classes to extend. Also provides callback mechanism and logging
+ * facility.
  */
-instance.base.Controller = instance.base.Class.extend( /** @lends instance.base.Controller# */{
+instance.base.SessionAware = instance.base.Class.extend({
+    init: function(session) {
+        this.session = session;
+        
+        // Transform on_* method into openerp.base.callbacks
+        for (var name in this) {
+            if(typeof(this[name]) == "function") {
+                this[name].debug_name = name;
+                // bind ALL function to this not only on_and _do ?
+                if((/^on_|^do_/).test(name)) {
+                    this[name] = instance.base.callback(this, this[name]);
+                }
+            }
+        }
+    },
+    /**
+     * Performs a JSON-RPC call
+     *
+     * @param {String} url endpoint url
+     * @param {Object} data RPC parameters
+     * @param {Function} success RPC call success callback
+     * @param {Function} error RPC call error callback
+     * @returns {jQuery.Deferred} deferred object for the RPC call
+     */
+    rpc: function(url, data, success, error) {
+        return this.session.rpc(url, data, success, error);
+    },
+    log: function() {
+        var args = Array.prototype.slice.call(arguments);
+        var caller = arguments.callee.caller;
+        // TODO add support for line number using
+        // https://github.com/emwendelin/javascript-stacktrace/blob/master/stacktrace.js
+        // args.unshift("" + caller.debug_name);
+        this.on_log.apply(this,args);
+    },
+    on_log: function() {
+        if(window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
+            var notify = false;
+            var body = false;
+            if(window.console) {
+                console.log(arguments);
+            } else {
+                body = true;
+            }
+            var a = Array.prototype.slice.call(arguments, 0);
+            for(var i = 0; i < a.length; i++) {
+                var v = a[i]==null ? "null" : a[i].toString();
+                if(i==0) {
+                    notify = v.match(/^not/);
+                    body = v.match(/^bod/);
+                }
+                if(body) {
+                    $('
    ').text(v).appendTo($('body'));
+                }
+                if(notify && this.notification) {
+                    this.notification.notify("Logging:",v);
+                }
+            }
+        }
+    }
+});
+
+instance.base.Controller = instance.base.SessionAware.extend({
+    /**
+     * The name of the QWeb template that will be used for rendering. Must be
+     * redefined in subclasses or the default render() method can not be used.
+     * 
+     * @type string
+     */
+    template: null,
+    /**
+     * The prefix used to generate an id automatically. Should be redefined in
+     * subclasses. If it is not defined, a generic identifier will be used.
+     * 
+     * @type string
+     */
+    identifier_prefix: 'generic-identifier',
     /**
      * @constructs
      * rpc operations, event binding and callback calling should be done in
      * start() instead of init so that events can be hooked in between.
      */
     init: function(parent, element_id) {
+        this._super((parent || {}).session);
+        //TODO niv: get away the possibility to specify an id
         this.element_id = element_id;
+        this.element_id = this.element_id || _.uniqueId(this.identifier_prefix);
+        
         this.$element = $('#' + element_id);
         if (element_id) {
             instance.screen[element_id] = this;
         }
         // save the parent children relationship
-        this.controller_parent = parent;
-        this.controller_children = [];
-        if(parent && parent.controller_children) {
-            parent.controller_children.push(this);
-        }
-        // backward compatibility
-        this.parent = this.controller_parent;
-        this.children = this.controller_children;
-
-        // Transform on_* method into openerp.base.callbacks
-        for (var name in this) {
-            if(typeof(this[name]) == "function") {
-                this[name].debug_name = name;
-                // bind ALL function to this not only on_and _do ?
-                if((/^on_|^do_/).test(name)) {
-                    this[name] = instance.base.callback(this, this[name]);
-                }
-            }
+        this.widget_parent = parent;
+        this.widget_children = [];
+        if(parent && parent.widget_children) {
+            parent.widget_children.push(this);
         }
     },
+    /**
+     * Render the widget. This.template must be defined.
+     * The content of the current object is passed as context to the template.
+     * 
+     * @param {object} additional Additional context arguments to pass to the template.
+     */
+    render: function (additional) {
+        return QWeb.render(this.template, _.extend({widget: this}, additional || {}));
+    },
     /**
      * Event binding, rpc and callback calling required to initialize the
      * object should happen here
@@ -196,354 +270,36 @@ instance.base.Controller = instance.base.Class.extend( /** @lends instance.base.
      * @returns {jQuery.Deferred}
      */
     start: function() {
-        // returns an already fulfilled promise. Maybe we could return nothing?
-        // $.when can take non-deferred and in that case it simply considers
-        // them all as fulfilled promises.
-        // But in thise case we *have* to ensure callers use $.when and don't
-        // try to call deferred methods on this return value.
+        var tmp = document.getElementById(this.element_id);
+        this.$element = tmp ? $(tmp) : null;
         return $.Deferred().done().promise();
     },
     stop: function() {
-        if (this.parent && this.parent.children) {
-            this.parent.children = _.without(this.parent.children, this);
-            this.parent.controller_children = this.parent.children;
+        _.each(_.clone(this.widget_children), function(el) {
+            el.stop();
+        });
+        if(this.$element != null) {
+            this.$element.remove();
         }
-        this.parent = null;
-        this.controller_parent = null;
-    },
-    log: function() {
-        var args = Array.prototype.slice.call(arguments);
-        var caller = arguments.callee.caller;
-        // TODO add support for line number using
-        // https://github.com/emwendelin/javascript-stacktrace/blob/master/stacktrace.js
-        // args.unshift("" + caller.debug_name);
-        this.on_log.apply(this,args);
-    },
-    on_log: function() {
-        if(window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
-            var notify = false;
-            var body = false;
-            if(window.console) {
-                console.log(arguments);
-            } else {
-                body = true;
-            }
-            var a = Array.prototype.slice.call(arguments, 0);
-            for(var i = 0; i < a.length; i++) {
-                var v = a[i]==null ? "null" : a[i].toString();
-                if(i==0) {
-                    notify = v.match(/^not/);
-                    body = v.match(/^bod/);
-                }
-                if(body) {
-                    $('
    ').text(v).appendTo($('body'));
-                }
-                if(notify && this.notification) {
-                    this.notification.notify("Logging:",v);
-                }
-            }
+        if (this.widget_parent && this.widget_parent.widget_children) {
+            this.widget_parent.widget_children = _.without(this.widget_parent.widget_children, this);
         }
-
-    }
-});
-
-/**
- * OpenERP session aware controller
- * a controller takes an already existing dom element and manage it
- */
-instance.base.Controller = instance.base.Controller.extend( /** @lends openerp.base.Controller# */{
-    init: function(parent, element_id) {
-        this._super(parent, element_id);
-        if(this.controller_parent && this.controller_parent.session) {
-            this.session = this.controller_parent.session;
-        }
-    },
-    /**
-     * Performs a JSON-RPC call
-     *
-     * @param {String} url endpoint url
-     * @param {Object} data RPC parameters
-     * @param {Function} success RPC call success callback
-     * @param {Function} error RPC call error callback
-     * @returns {jQuery.Deferred} deferred object for the RPC call
-     */
-    rpc: function(url, data, success, error) {
-        return this.session.rpc(url, data, success, error);
+        this.widget_parent = null;
     },
     do_action: function(action, on_finished) {
-        return this.parent.do_action(action, on_finished);
+        return this.widget_parent.do_action(action, on_finished);
     }
 });
 
-/**
- * OpenERP session aware widget
- * A widget is a controller that doesnt take an element_id
- * it render its own html render() that you should insert into the dom
- * and bind it at start()
+/*
+ * For retro compatibility only, the only difference with is that render takes
+ * directly this instead of 
  */
 instance.base.BaseWidget = instance.base.Controller.extend({
-    /**
-     * The name of the QWeb template that will be used for rendering. Must be
-     * redefined in subclasses or the render() method can not be used.
-     * 
-     * @type string
-     */
-    template: null,
-    /**
-     * The prefix used to generate an id automatically. Should be redefined in
-     * subclasses. If it is not defined, a default identifier will be used.
-     * 
-     * @type string
-     */
-    identifier_prefix: 'generic-identifier',
-    /**
-     * Base class for widgets. Handle rendering (based on a QWeb template),
-     * identifier generation, parenting and destruction of the widget.
-     * Also initialize the identifier.
-     *
-     * @constructs
-     * @params {openerp.base.search.BaseWidget} parent The parent widget.
-     */
-    init: function (parent) {
-        this._super(parent);
-        this.make_id(this.identifier_prefix);
-    },
-    /**
-     * Sets and returns a globally unique identifier for the widget.
-     *
-     * If a prefix is appended, the identifier will be appended to it.
-     *
-     * @params sections prefix sections, empty/falsy sections will be removed
-     */
-    make_id: function () {
-        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
-        return this.element_id;
-    },
-    /**
-     * Render the widget. This.template must be defined.
-     * The content of the current object is passed as context to the template.
-     * 
-     * @param {object} additional Additional context arguments to pass to the template.
-     */
     render: function (additional) {
-        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
-    },
-    /**
-     * "Starts" the widgets. Called at the end of the rendering, this allows
-     * to get a jQuery object referring to the DOM ($element attribute).
-     */
-    start: function () {
-        this._super();
-        var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : null;
-    },
-    /**
-     * "Stops" the widgets. Called when the view destroys itself, this
-     * lets the widgets clean up after themselves.
-     */
-    stop: function () {
-        if(this.$element != null) {
-            this.$element.remove();
-        }
-        this._super();
+        return QWeb.render(this.template, _.extend(_.extend({}, this), additional || {}));
     }
 });
 
-// --------------------------------------------------------
-// N-style aka New-Style or Niv-Style
-// --------------------------------------------------------
-
-instance.base.NivController = instance.base.Class.extend({
-    init: function(parent) {
-        this.controller_parent = parent;
-        // Take the session of the parent if defined
-        if(this.controller_parent && this.controller_parent.session) {
-            this.session = this.controller_parent.session;
-        }
-        // Transform on_* method into openerp.base.callbacks
-        for (var name in this) {
-            if(typeof(this[name]) == "function") {
-                this[name].debug_name = name;
-                // bind ALL function to this not only on_and _do ?
-                if((/^on_|^do_/).test(name)) {
-                    this[name] = instance.base.callback(this, this[name]);
-                }
-            }
-        }
-    },
-    /**
-     * Event binding, rpc and callback calling required to initialize the
-     * object should happen here
-     *
-     * Returns a promise object letting callers (subclasses and direct callers)
-     * know when this component is done starting
-     *
-     * @returns {jQuery.Deferred}
-     */
-    start: function() {
-        // returns an already fulfilled promise. Maybe we could return nothing?
-        // $.when can take non-deferred and in that case it simply considers
-        // them all as fulfilled promises.
-        // But in thise case we *have* to ensure callers use $.when and don't
-        // try to call deferred methods on this return value.
-        return $.Deferred().done().promise();
-    },
-    stop: function() {
-    },
-    log: function() {
-        var args = Array.prototype.slice.call(arguments);
-        var caller = arguments.callee.caller;
-        // TODO add support for line number using
-        // https://github.com/emwendelin/javascript-stacktrace/blob/master/stacktrace.js
-        // args.unshift("" + caller.debug_name);
-        this.on_log.apply(this,args);
-    },
-    on_log: function() {
-        if(window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
-            var notify = false;
-            var body = false;
-            if(window.console) {
-                console.log(arguments);
-            } else {
-                body = true;
-            }
-            var a = Array.prototype.slice.call(arguments, 0);
-            for(var i = 0; i < a.length; i++) {
-                var v = a[i]==null ? "null" : a[i].toString();
-                if(i==0) {
-                    notify = v.match(/^not/);
-                    body = v.match(/^bod/);
-                }
-                if(body) {
-                    $('
    ').text(v).appendTo($('body'));
-                }
-                if(notify && this.notification) {
-                    this.notification.notify("Logging:",v);
-                }
-            }
-        }
-
-    },
-    /**
-     * Performs a JSON-RPC call
-     *
-     * @param {String} url endpoint url
-     * @param {Object} data RPC parameters
-     * @param {Function} success RPC call success callback
-     * @param {Function} error RPC call error callback
-     * @returns {jQuery.Deferred} deferred object for the RPC call
-     */
-    rpc: function(url, data, success, error) {
-        return this.session.rpc(url, data, success, error);
-    },
-    do_action: function(action, on_finished) {
-        return this.controller_parent.do_action(action, on_finished);
-    }
-});
-
-instance.base.NivWidget = instance.base.Controller.extend({
-    /**
-     * The name of the QWeb template that will be used for rendering. Must be
-     * redefined in subclasses or the render() method can not be used.
-     * 
-     * @type string
-     */
-    template: null,
-    /**
-     * The prefix used to generate an id automatically. Should be redefined in
-     * subclasses. If it is not defined, a default identifier will be used.
-     * 
-     * @type string
-     */
-    identifier_prefix: 'generic-identifier',
-    /**
-     * Base class for widgets. Handle rendering (based on a QWeb template),
-     * identifier generation, parenting and destruction of the widget.
-     * Also initialize the identifier.
-     *
-     * @constructs
-     * @params {openerp.base.search.BaseWidget} parent The parent widget.
-     */
-    init: function(parent, element_id) {
-        this._super(parent);
-        this.make_id(this.identifier_prefix);
-        // this.element_id = element_id;
-        // this.$element = $('#' + element_id);
-        // if (element_id) {
-        //     instance.screen[element_id] = this;
-        // }
-        // save the parent children relationship
-        this.controller_children = [];
-        if(parent && parent.controller_children) {
-            parent.controller_children.push(this);
-        }
-        // backward compatibility
-        this.parent = this.controller_parent;
-        this.children = this.controller_children;
-
-    },
-    /**
-     * Event binding, rpc and callback calling required to initialize the
-     * object should happen here
-     *
-     * Returns a promise object letting callers (subclasses and direct callers)
-     * know when this component is done starting
-     *
-     * @returns {jQuery.Deferred}
-     */
-    /**
-     * "Starts" the widgets. Called at the end of the rendering, this allows
-     * to get a jQuery object referring to the DOM ($element attribute).
-     */
-    start: function () {
-        this._super();
-        var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : null;
-    },
-    stop: function() {
-        if(this.$element != null) {
-            this.$element.remove();
-        }
-        if (this.parent && this.parent.children) {
-            this.parent.children = _.without(this.parent.children, this);
-            this.parent.controller_children = this.parent.children;
-        }
-        this.parent = null;
-        this.controller_parent = null;
-    },
-    /**
-     * Sets and returns a globally unique identifier for the widget.
-     *
-     * If a prefix is appended, the identifier will be appended to it.
-     *
-     * @params sections prefix sections, empty/falsy sections will be removed
-     */
-    make_id: function () {
-        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
-        return this.element_id;
-    },
-    /**
-     * Render the widget. This.template must be defined.
-     * The content of the current object is passed as context to the template.
-     * 
-     * @param {object} additional Additional context arguments to pass to the template.
-     */
-    render: function (additional) {
-        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
-    },
-    widget_add: function(element, addfunc) {
-    },
-    widget_append: function(element) {
-    },
-    widget_prepend: function(element) {
-    },
-    widget_append2: function(element) {
-    },
-    widget_prepend2: function(element) {
-    },
-});
-
-
-};
-
+}
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 8a51abe1335..b74c845aa0d 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -891,7 +891,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
         if(this.$element.closest("table.oe-searchview-render-line").css("display") == "none") {
             return null;
         }
-        return _.reduce(this.children,
+        return _.reduce(this.widget_children,
             function(mem, x) { return mem.concat(x.get_domain());}, []);
     },
     on_activate: function() {
@@ -910,9 +910,9 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
         }
     },
     check_last_element: function() {
-        _.each(this.children, function(x) {x.set_last_group(false);});
-        if (this.children.length >= 1) {
-            this.children[this.children.length - 1].set_last_group(true);
+        _.each(this.widget_children, function(x) {x.set_last_group(false);});
+        if (this.widget_children.length >= 1) {
+            this.widget_children[this.widget_children.length - 1].set_last_group(true);
         }
     }
 });
@@ -926,7 +926,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
     },
     add_prop: function() {
         var prop = new openerp.base.search.ExtendedSearchProposition(this, this.fields);
-        var render = prop.render({'index': this.children.length - 1});
+        var render = prop.render({'index': this.widget_children.length - 1});
         this.$element.find('.searchview_extended_propositions_list').append(render);
         prop.start();
     },
@@ -943,7 +943,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
         });
     },
     get_domain: function() {
-        var props = _(this.children).chain().map(function(x) {
+        var props = _(this.widget_children).chain().map(function(x) {
             return x.get_proposition();
         }).compact().value();
         var choice = this.$element.find(".searchview_extended_group_choice").val();
@@ -953,9 +953,9 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
             props);
     },
     stop: function() {
-        var parent = this.parent;
-        if (this.parent.children.length == 1)
-            this.parent.hide();
+        var parent = this.widget_parent;
+        if (this.widget_parent.widget_children.length == 1)
+            this.widget_parent.hide();
         this._super();
         parent.check_last_element();
     },
@@ -992,9 +992,12 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
         });
     },
     stop: function() {
-        if (this.parent.children.length == 1)
-            this.parent.stop();
+        var parent;
+        if (this.widget_parent.widget_children.length == 1)
+            parent = this.widget_parent;
         this._super();
+        if (parent)
+            parent.stop();
     },
     changed: function() {
         var nval = this.$element.find(".searchview_extended_prop_field").val();

From 8e8ca695cb7136048e8d5c428c1daaf06af7f476 Mon Sep 17 00:00:00 2001
From: niv-openerp 
Date: Thu, 28 Jul 2011 16:49:12 +0200
Subject: [PATCH 118/167] [imp] changed Controller to Widget and BaseWidget to
 OldWidget

bzr revid: nicolas.vanhoren@openerp.com-20110728144912-t3kml1yo8gt261ga
---
 addons/base/static/src/js/chrome.js           | 26 +++++++++----------
 addons/base/static/src/js/controller.js       |  6 ++---
 addons/base/static/src/js/data.js             |  8 +++---
 addons/base/static/src/js/form.js             |  8 +++---
 addons/base/static/src/js/search.js           | 26 +++++++++----------
 addons/base/static/src/js/view_help.js        |  4 +--
 addons/base/static/src/js/view_tree.js        |  2 +-
 addons/base/static/src/js/views.js            | 10 +++----
 addons/base_diagram/static/src/js/diagram.js  |  2 +-
 addons/base_gantt/static/src/js/gantt.js      |  2 +-
 .../web_mobile/static/src/js/chrome_mobile.js | 14 +++++-----
 .../web_mobile/static/src/js/form_mobile.js   |  2 +-
 .../web_mobile/static/src/js/list_mobile.js   |  2 +-
 13 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 996642385ef..41a17d37d94 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -137,7 +137,7 @@ openerp.base.Registry = openerp.base.Class.extend( /** @lends openerp.base.Regis
 });
 
 
-openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.Session# */{
+openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Session# */{
     /**
      * @constructs
      * @param element_id to use for exception reporting
@@ -405,7 +405,7 @@ openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.S
     }
 });
 
-openerp.base.Notification =  openerp.base.Controller.extend({
+openerp.base.Notification =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.$element.notify({
@@ -427,7 +427,7 @@ openerp.base.Notification =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Dialog = openerp.base.BaseWidget.extend({
+openerp.base.Dialog = openerp.base.OldWidget.extend({
     dialog_title: "",
     identifier_prefix: 'dialog',
     init: function (parent, options) {
@@ -557,7 +557,7 @@ openerp.base.CrashManager = openerp.base.Dialog.extend({
     }
 });
 
-openerp.base.Loading =  openerp.base.Controller.extend({
+openerp.base.Loading =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.count = 0;
@@ -576,10 +576,10 @@ openerp.base.Loading =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Database = openerp.base.Controller.extend({
+openerp.base.Database = openerp.base.Widget.extend({
 });
 
-openerp.base.Login =  openerp.base.Controller.extend({
+openerp.base.Login =  openerp.base.Widget.extend({
     remember_creditentials: true,
     init: function(parent, element_id) {
         this._super(parent, element_id);
@@ -657,7 +657,7 @@ openerp.base.Login =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Header =  openerp.base.Controller.extend({
+openerp.base.Header =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
     },
@@ -671,7 +671,7 @@ openerp.base.Header =  openerp.base.Controller.extend({
     on_logout: function() {}
 });
 
-openerp.base.Menu =  openerp.base.Controller.extend({
+openerp.base.Menu =  openerp.base.Widget.extend({
     init: function(parent, element_id, secondary_menu_id) {
         this._super(parent, element_id);
         this.secondary_menu_id = secondary_menu_id;
@@ -752,16 +752,16 @@ openerp.base.Menu =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Homepage = openerp.base.Controller.extend({
+openerp.base.Homepage = openerp.base.Widget.extend({
 });
 
-openerp.base.Preferences = openerp.base.Controller.extend({
+openerp.base.Preferences = openerp.base.Widget.extend({
 });
 
-openerp.base.ImportExport = openerp.base.Controller.extend({
+openerp.base.ImportExport = openerp.base.Widget.extend({
 });
 
-openerp.base.WebClient = openerp.base.Controller.extend({
+openerp.base.WebClient = openerp.base.Widget.extend({
     init: function(element_id) {
         this._super(null, element_id);
 
@@ -778,7 +778,7 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.crashmanager.start(false);
 
         // Do you autorize this ? will be replaced by notify() in controller
-        openerp.base.Controller.prototype.notification = new openerp.base.Notification(this, "oe_notification");
+        openerp.base.Widget.prototype.notification = new openerp.base.Notification(this, "oe_notification");
 
         this.header = new openerp.base.Header(this, "oe_header");
         this.login = new openerp.base.Login(this, "oe_login");
diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index a9bf99f8764..2ed00f29ff9 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -140,7 +140,7 @@ instance.base.generate_null_object_class = function(claz, add) {
             copy_proto(prototype.prototype);
     };
     copy_proto(claz.prototype);
-    newer.init = instance.base.Controller.prototype.init;
+    newer.init = instance.base.Widget.prototype.init;
     var tmpclass = claz.extend(newer);
     return tmpclass.extend(add || {});
 };
@@ -214,7 +214,7 @@ instance.base.SessionAware = instance.base.Class.extend({
     }
 });
 
-instance.base.Controller = instance.base.SessionAware.extend({
+instance.base.Widget = instance.base.SessionAware.extend({
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -295,7 +295,7 @@ instance.base.Controller = instance.base.SessionAware.extend({
  * For retro compatibility only, the only difference with is that render takes
  * directly this instead of 
  */
-instance.base.BaseWidget = instance.base.Controller.extend({
+instance.base.OldWidget = instance.base.Widget.extend({
     render: function (additional) {
         return QWeb.render(this.template, _.extend(_.extend({}, this), additional || {}));
     }
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 9eb08cf0fde..5545e32df17 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -18,7 +18,7 @@ openerp.base.serialize_sort = function (criterion) {
         }).join(', ');
 };
 
-openerp.base.DataGroup =  openerp.base.Controller.extend( /** @lends openerp.base.DataGroup# */{
+openerp.base.DataGroup =  openerp.base.Widget.extend( /** @lends openerp.base.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
      * records.
@@ -30,7 +30,7 @@ openerp.base.DataGroup =  openerp.base.Controller.extend( /** @lends openerp.bas
      * content of the current grouping level.
      *
      * @constructs
-     * @extends openerp.base.Controller
+     * @extends openerp.base.Widget
      *
      * @param {openerp.base.Session} session Current OpenERP session
      * @param {String} model name of the model managed by this DataGroup
@@ -232,13 +232,13 @@ openerp.base.StaticDataGroup = openerp.base.GrouplessDataGroup.extend( /** @lend
     }
 });
 
-openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.DataSet# */{
+openerp.base.DataSet =  openerp.base.Widget.extend( /** @lends openerp.base.DataSet# */{
     /**
      * DateaManagement interface between views and the collection of selected
      * OpenERP records (represents the view's state?)
      *
      * @constructs
-     * @extends openerp.base.Controller
+     * @extends openerp.base.Widget
      *
      * @param {String} model the OpenERP model this dataset will manage
      */
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 80ef7efe96d..d47182a22da 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -441,7 +441,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi
 /** @namespace */
 openerp.base.form = {};
 
-openerp.base.form.SidebarAttachments = openerp.base.Controller.extend({
+openerp.base.form.SidebarAttachments = openerp.base.Widget.extend({
     init: function(parent, element_id, form_view) {
         this._super(parent, element_id);
         this.view = form_view;
@@ -548,7 +548,7 @@ openerp.base.form.compute_domain = function(expr, fields) {
     return _.all(stack);
 };
 
-openerp.base.form.Widget = openerp.base.Controller.extend({
+openerp.base.form.Widget = openerp.base.Widget.extend({
     template: 'Widget',
     init: function(view, node) {
         this.view = view;
@@ -1934,7 +1934,7 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
     }
 });
 
-openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({
+openerp.base.form.SelectCreatePopup = openerp.base.OldWidget.extend({
     identifier_prefix: "selectcreatepopup",
     template: "SelectCreatePopup",
     /**
@@ -2074,7 +2074,7 @@ openerp.base.form.SelectCreateListView = openerp.base.ListView.extend({
     }
 });
 
-openerp.base.form.FormOpenPopup = openerp.base.BaseWidget.extend({
+openerp.base.form.FormOpenPopup = openerp.base.OldWidget.extend({
     identifier_prefix: "formopenpopup",
     template: "FormOpenPopup",
     /**
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index b74c845aa0d..a63ba79355c 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -1,6 +1,6 @@
 openerp.base.search = function(openerp) {
 
-openerp.base.SearchView = openerp.base.Controller.extend({
+openerp.base.SearchView = openerp.base.Widget.extend({
     init: function(parent, element_id, dataset, view_id, defaults) {
         this._super(parent, element_id);
         this.view_manager = parent || new openerp.base.NullViewManager();
@@ -386,13 +386,13 @@ openerp.base.search.Invalid = openerp.base.Class.extend( /** @lends openerp.base
                 ': [' + this.value + '] is ' + this.message);
     }
 });
-openerp.base.search.Widget = openerp.base.Controller.extend( /** @lends openerp.base.search.Widget# */{
+openerp.base.search.Widget = openerp.base.Widget.extend( /** @lends openerp.base.search.Widget# */{
     template: null,
     /**
      * Root class of all search widgets
      *
      * @constructs
-     * @extends openerp.base.Controller
+     * @extends openerp.base.Widget
      *
      * @param view the ancestor view of this widget
      */
@@ -851,7 +851,7 @@ openerp.base.search.ManyToManyField = openerp.base.search.CharField.extend({
     // TODO: .related_columns (Array), .context, .domain
 });
 
-openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearch = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search',
     identifier_prefix: 'extended-search',
     init: function (parent, model) {
@@ -917,7 +917,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
     }
 });
 
-openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.group',
     identifier_prefix: 'extended-search-group',
     init: function (parent, fields) {
@@ -967,7 +967,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
     }
 });
 
-openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition',
     identifier_prefix: 'extended-search-proposition',
     init: function (parent, fields) {
@@ -1057,7 +1057,7 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
     }
 });
 
-openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.Char = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.char',
     identifier_prefix: 'extended-search-proposition-char',
     operators: [
@@ -1074,7 +1074,7 @@ openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.ext
         return this.$element.val();
     }
 });
-openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.datetime',
     identifier_prefix: 'extended-search-proposition-datetime',
     operators: [
@@ -1096,7 +1096,7 @@ openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.BaseWidget
         });
     }
 });
-openerp.base.search.ExtendedSearchProposition.Date = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.Date = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.date',
     identifier_prefix: 'extended-search-proposition-date',
     operators: [
@@ -1118,7 +1118,7 @@ openerp.base.search.ExtendedSearchProposition.Date = openerp.base.BaseWidget.ext
         });
     }
 });
-openerp.base.search.ExtendedSearchProposition.Integer = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.Integer = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.integer',
     identifier_prefix: 'extended-search-proposition-integer',
     operators: [
@@ -1137,7 +1137,7 @@ openerp.base.search.ExtendedSearchProposition.Integer = openerp.base.BaseWidget.
         return Math.round(value);
     }
 });
-openerp.base.search.ExtendedSearchProposition.Float = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.Float = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.float',
     identifier_prefix: 'extended-search-proposition-float',
     operators: [
@@ -1156,7 +1156,7 @@ openerp.base.search.ExtendedSearchProposition.Float = openerp.base.BaseWidget.ex
         return value;
     }
 });
-openerp.base.search.ExtendedSearchProposition.Selection = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.Selection = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.selection',
     identifier_prefix: 'extended-search-proposition-selection',
     operators: [
@@ -1170,7 +1170,7 @@ openerp.base.search.ExtendedSearchProposition.Selection = openerp.base.BaseWidge
         return this.$element.val();
     }
 });
-openerp.base.search.ExtendedSearchProposition.Boolean = openerp.base.BaseWidget.extend({
+openerp.base.search.ExtendedSearchProposition.Boolean = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search.proposition.boolean',
     identifier_prefix: 'extended-search-proposition-boolean',
     operators: [
diff --git a/addons/base/static/src/js/view_help.js b/addons/base/static/src/js/view_help.js
index 704c982eb3a..aa98f59c3ab 100644
--- a/addons/base/static/src/js/view_help.js
+++ b/addons/base/static/src/js/view_help.js
@@ -4,10 +4,10 @@
 
 openerp.base.view_help = function(openerp) {
 
-openerp.base.ProcessView = openerp.base.Controller.extend({
+openerp.base.ProcessView = openerp.base.Widget.extend({
 });
 
-openerp.base.HelpView = openerp.base.Controller.extend({
+openerp.base.HelpView = openerp.base.Widget.extend({
 });
 
 };
diff --git a/addons/base/static/src/js/view_tree.js b/addons/base/static/src/js/view_tree.js
index ceb5478a4a7..90972f84973 100644
--- a/addons/base/static/src/js/view_tree.js
+++ b/addons/base/static/src/js/view_tree.js
@@ -5,7 +5,7 @@
 openerp.base.view_tree = function(openerp) {
 
 openerp.base.views.add('tree', 'openerp.base.TreeView');
-openerp.base.TreeView = openerp.base.Controller.extend({
+openerp.base.TreeView = openerp.base.Widget.extend({
 /**
  * Genuine tree view (the one displayed as a tree, not the list)
  */
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 5e1d6be4f61..a062d813851 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -4,7 +4,7 @@
 
 openerp.base.views = function(openerp) {
 
-openerp.base.ActionManager = openerp.base.Controller.extend({
+openerp.base.ActionManager = openerp.base.Widget.extend({
 // process all kind of actions
     init: function(parent, element_id) {
         this._super(parent, element_id);
@@ -112,7 +112,7 @@ openerp.base.ActionDialog = openerp.base.Dialog.extend({
     }
 });
 
-openerp.base.ViewManager =  openerp.base.Controller.extend({
+openerp.base.ViewManager =  openerp.base.Widget.extend({
     init: function(parent, element_id, dataset, views) {
         this._super(parent, element_id);
         this.model = dataset.model;
@@ -333,7 +333,7 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         }
     },
     stop: function() {
-        // should be replaced by automatic destruction implemented in BaseWidget
+        // should be replaced by automatic destruction implemented in Widget
         this._super();
     },
     /**
@@ -360,7 +360,7 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
     }
 });
 
-openerp.base.Sidebar = openerp.base.Controller.extend({
+openerp.base.Sidebar = openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.items = {};
@@ -461,7 +461,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
     }
 });
 
-openerp.base.View = openerp.base.Controller.extend({
+openerp.base.View = openerp.base.Widget.extend({
     set_default_options: function(options) {
         this.options = options || {};
         _.defaults(this.options, {
diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js
index af56c256ee7..b992b5cbf42 100644
--- a/addons/base_diagram/static/src/js/diagram.js
+++ b/addons/base_diagram/static/src/js/diagram.js
@@ -5,7 +5,7 @@
 openerp.base.diagram = function (openerp) {
 	
 openerp.base.views.add('diagram', 'openerp.base.DiagramView');
-openerp.base.DiagramView = openerp.base.Controller.extend({
+openerp.base.DiagramView = openerp.base.Widget.extend({
 	init: function(view_manager, session, element_id, dataset, view_id){
 		this._super(session, element_id);
         this.view_manager = view_manager;
diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index cf0ce449d60..09174e25ab7 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -5,7 +5,7 @@
 openerp.base_gantt = function (openerp) {
 QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml');
 openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView');
-openerp.base_gantt.GanttView = openerp.base.Controller.extend({
+openerp.base_gantt.GanttView = openerp.base.Widget.extend({
 
 init: function(view_manager, session, element_id, dataset, view_id) {
 
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 138d37136a9..785cf98b6aa 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -1,5 +1,5 @@
 openerp.web_mobile.chrome_mobile = function(openerp) {
-openerp.web_mobile.Shortcuts =  openerp.base.Controller.extend({
+openerp.web_mobile.Shortcuts =  openerp.base.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
     },
@@ -19,7 +19,7 @@ openerp.web_mobile.Shortcuts =  openerp.base.Controller.extend({
         this.listview.start();
     }
 });
-openerp.web_mobile.Header =  openerp.base.Controller.extend({
+openerp.web_mobile.Header =  openerp.base.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
     },
@@ -36,7 +36,7 @@ openerp.web_mobile.Header =  openerp.base.Controller.extend({
         }
     }
 });
-openerp.web_mobile.Secondary =  openerp.base.Controller.extend({
+openerp.web_mobile.Secondary =  openerp.base.Widget.extend({
     init: function(session, element_id, secondary_menu_id) {
         this._super(session, element_id);
         this.data = secondary_menu_id;
@@ -74,7 +74,7 @@ openerp.web_mobile.Secondary =  openerp.base.Controller.extend({
     }
 });
 
-openerp.web_mobile.Menu =  openerp.base.Controller.extend({
+openerp.web_mobile.Menu =  openerp.base.Widget.extend({
     init: function(session, element_id, secondary_menu_id) {
         this._super(session, element_id);
         this.secondary_menu_id = secondary_menu_id;
@@ -106,7 +106,7 @@ openerp.web_mobile.Menu =  openerp.base.Controller.extend({
         this.secondary.start();
     }
 });
-openerp.web_mobile.Options =  openerp.base.Controller.extend({
+openerp.web_mobile.Options =  openerp.base.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
     },
@@ -121,7 +121,7 @@ openerp.web_mobile.Options =  openerp.base.Controller.extend({
         this.login.start();
     }
 });
-openerp.web_mobile.Login =  openerp.base.Controller.extend({
+openerp.web_mobile.Login =  openerp.base.Widget.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
     },
@@ -190,7 +190,7 @@ openerp.web_mobile.Login =  openerp.base.Controller.extend({
         });
     }
 });
-openerp.web_mobile.MobileWebClient = openerp.base.Controller.extend({
+openerp.web_mobile.MobileWebClient = openerp.base.Widget.extend({
     init: function(element_id) {
         var self = this;
         this._super(null, element_id);
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index 9fa219ee86e..51bfd719c7f 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -1,5 +1,5 @@
 openerp.web_mobile.form_mobile = function (openerp) {
-openerp.web_mobile.FormView = openerp.base.Controller.extend({
+openerp.web_mobile.FormView = openerp.base.Widget.extend({
     init: function(session, element_id, list_id, action) {
         this._super(session, element_id);
         this.list_id = list_id;
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index f7a88019e3d..809797bfe0f 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -1,5 +1,5 @@
 openerp.web_mobile.list_mobile = function (openerp) {
-openerp.web_mobile.ListView = openerp.base.Controller.extend({
+openerp.web_mobile.ListView = openerp.base.Widget.extend({
     init: function(session, element_id, list_id) {
         this._super(session, element_id);
         this.list_id = list_id;

From 64922add3a525df525b1b8258e5f9f3a7919118a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi 
Date: Thu, 28 Jul 2011 17:15:45 +0200
Subject: [PATCH 119/167] [IMP] Improve sidebar

bzr revid: fme@openerp.com-20110728151545-2fsy941wjznod4q8
---
 addons/base/static/src/css/base.css |  3 +++
 addons/base/static/src/js/form.js   |  5 ++--
 addons/base/static/src/js/list.js   |  1 +
 addons/base/static/src/js/views.js  | 40 ++++++++++++++++++++++++++---
 addons/base/static/src/xml/base.xml |  4 +--
 5 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index bbf8cba0fe7..b173386e234 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -30,6 +30,9 @@ body.openerp {
 .openerp .oe-number {
     text-align: right !important;
 }
+.openerp .oe_hide {
+    display: none !important;
+}
 
 /* STATES */
 .openerp .on_logged {
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index d47182a22da..f8e2e91667d 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -88,9 +88,10 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormVi
         if (this.options.sidebar && this.options.sidebar_id) {
             this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id);
             this.sidebar.start();
-            this.sidebar.attachments = new openerp.base.form.SidebarAttachments(this.sidebar, this.sidebar.add_section("Attachments"), this);
-            this.sidebar.add_toolbar(data.fields_view.toolbar);
             this.sidebar.do_unfold();
+            this.sidebar.attachments = new openerp.base.form.SidebarAttachments(this.sidebar, this.sidebar.add_section('attachments', "Attachments"), this);
+            this.sidebar.add_toolbar(data.fields_view.toolbar);
+            this.set_common_sidebar_sections(this.sidebar);
         }
         this.has_been_loaded.resolve();
     },
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 0c595bed22d..d64d83329c0 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -271,6 +271,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id);
             this.sidebar.start();
             this.sidebar.add_toolbar(data.fields_view.toolbar);
+            this.set_common_sidebar_sections(this.sidebar);
         }
     },
     /**
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index a062d813851..ad580383c6d 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -364,6 +364,7 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.items = {};
+        this.sections = {};
     },
     start: function() {
         var self = this;
@@ -385,11 +386,11 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
                         classname: 'oe_sidebar_' + type[0]
                     }
                 }
-                self.add_section(type[1], items);
+                self.add_section(type[0], type[1], items);
             }
         });
     },
-    add_section: function(name, items) {
+    add_section: function(code, name, items) {
         // For each section, we pass a name/label and optionally an array of items.
         // If no items are passed, then the section will be created as a custom section
         // returning back an element_id to be used by a custom controller.
@@ -398,11 +399,12 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
         //    label: label to be displayed for the link,
         //    action: action to be launch when the link is clicked,
         //    callback: a function to be executed when the link is clicked,
-        //    classname: optionnal dom class name for the line,
+        //    classname: optional dom class name for the line,
+        //    title: optional title for the link
         // }
         // Note: The item should have one action or/and a callback
         var self = this,
-            section_id = _.uniqueId(this.element_id + '_section_');
+            section_id = _.uniqueId(this.element_id + '_section_' + code + '_');
         if (items) {
             for (var i = 0; i < items.length; i++) {
                 items[i].element_id = _.uniqueId(section_id + '_item_');
@@ -412,6 +414,7 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
         var $section = $(QWeb.render("Sidebar.section", {
             section_id: section_id,
             name: name,
+            classname: 'oe_sidebar_' + code,
             items: items
         }));
         if (items) {
@@ -429,6 +432,7 @@ openerp.base.Sidebar = openerp.base.Widget.extend({
             });
         }
         $section.appendTo(this.$element.find('div.sidebar-actions'));
+        this.sections[code] = $section;
         return section_id;
     },
     do_fold: function() {
@@ -530,6 +534,34 @@ openerp.base.View = openerp.base.Widget.extend({
      */
     set_embedded_view: function(embedded_view) {
         this.embedded_view = embedded_view;
+    },
+    set_common_sidebar_sections: function(sidebar) {
+        var items = [];
+        sidebar.add_section('customize', "Customize", [
+            {
+                label: "Manage Views",
+                callback: this.on_sidebar_manage_view,
+                title: "Manage views of the current object"
+            }, {
+                label: "Edit Workflow",
+                callback: this.on_sidebar_edit_workflow,
+                title: "Manage views of the current object",
+                classname: 'oe_hide oe_sidebar_edit_workflow'
+            }, {
+                label: "Customize Object",
+                callback: this.on_sidebar_customize_object,
+                title: "Manage views of the current object"
+            }
+        ]);
+    },
+    on_sidebar_manage_view: function() {
+        console.log('Todo');
+    },
+    on_sidebar_edit_workflow: function() {
+        console.log('Todo');
+    },
+    on_sidebar_customize_object: function() {
+        console.log('Todo');
     }
 });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e34c20dcb8a..88f154118db 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -248,10 +248,10 @@
 
 
     
    
-    
    
+    
    
         
      
             
    • 
-                
+                
                     
                 
             
      • 

From 2ba74a4c8a0841347578c1038e1374318ba118f5 Mon Sep 17 00:00:00 2001
From: niv-openerp 
Date: Thu, 28 Jul 2011 17:24:56 +0200
Subject: [PATCH 120/167] [imp] Mainly documentation and small modifications to
 Widget.

bzr revid: nicolas.vanhoren@openerp.com-20110728152456-2mgkbcqhm7d0zz3m
---
 addons/base/static/src/js/controller.js | 74 ++++++++++++++++++-------
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index 2ed00f29ff9..7abf35c10ed 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -149,8 +149,10 @@ instance.base.generate_null_object_class = function(claz, add) {
 // OLD 
 // --------------------------------------------------------
 /**
- * Class for OpenERP session aware classes to extend. Also provides callback mechanism and logging
- * facility.
+ * Utility class that any class is allowed to extend to easy common manipulations.
+ * 
+ * It provides rpc calls, callback on all methods preceded by "on_" or "do_" and a
+ * logging facility.
  */
 instance.base.SessionAware = instance.base.Class.extend({
     init: function(session) {
@@ -214,6 +216,18 @@ instance.base.SessionAware = instance.base.Class.extend({
     }
 });
 
+/**
+ * Base class for all visual components. Provides a lot of functionalities helpful
+ * for the management of a part of the DOM.
+ * 
+ * Widget handles:
+ * - Rendering with QWeb.
+ * - Life-cycle management and parenting (when a parent is destroyed, all its children are
+ *     destroyed too).
+ * - Insertion in DOM.
+ * 
+ * Widget also extends SessionAware for ease of use.
+ */
 instance.base.Widget = instance.base.SessionAware.extend({
     /**
      * The name of the QWeb template that will be used for rendering. Must be
@@ -231,16 +245,24 @@ instance.base.Widget = instance.base.SessionAware.extend({
     identifier_prefix: 'generic-identifier',
     /**
      * @constructs
-     * rpc operations, event binding and callback calling should be done in
-     * start() instead of init so that events can be hooked in between.
+     * Construct the widget and set its parent if a parent is given.
+     * 
+     * @param {Widget} parent Binds the current instance to the given Widget instance.
+     * When that widget is destroyed by calling stop(), the current instance will be
+     * destroyed too. Can be null.
+     * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
+     * to bind the current Widget to an already existing part of the DOM, which is not compatible
+     * with the DOM insertion methods provided by the current implementation of Widget. So
+     * for new components this argument should not be provided any more.
      */
     init: function(parent, element_id) {
         this._super((parent || {}).session);
-        //TODO niv: get away the possibility to specify an id
         this.element_id = element_id;
         this.element_id = this.element_id || _.uniqueId(this.identifier_prefix);
         
-        this.$element = $('#' + element_id);
+        var tmp = document.getElementById(this.element_id);
+        this.$element = tmp ? $(tmp) : undefined;
+        // TODO niv: wtf??
         if (element_id) {
             instance.screen[element_id] = this;
         }
@@ -252,8 +274,8 @@ instance.base.Widget = instance.base.SessionAware.extend({
         }
     },
     /**
-     * Render the widget. This.template must be defined.
-     * The content of the current object is passed as context to the template.
+     * Renders the widget using QWeb, `this.template` must be defined.
+     * The context given to QWeb contains the "widget" key that references `this`.
      * 
      * @param {object} additional Additional context arguments to pass to the template.
      */
@@ -261,19 +283,24 @@ instance.base.Widget = instance.base.SessionAware.extend({
         return QWeb.render(this.template, _.extend({widget: this}, additional || {}));
     },
     /**
-     * Event binding, rpc and callback calling required to initialize the
-     * object should happen here
-     *
-     * Returns a promise object letting callers (subclasses and direct callers)
-     * know when this component is done starting
+     * Method called after rendering. Mostly used to bind actions, perform asynchronous
+     * calls, etc...
+     * 
+     * By convention, the method should return a promise to inform the caller when
+     * this widget has been initialized.
      *
      * @returns {jQuery.Deferred}
      */
     start: function() {
-        var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : null;
+        if (!this.$element) {
+            var tmp = document.getElementById(this.element_id);
+            this.$element = tmp ? $(tmp) : undefined;
+        }
         return $.Deferred().done().promise();
     },
+    /**
+     * Destroys the current widget, also destory all its children before destroying itself.
+     */
     stop: function() {
         _.each(_.clone(this.widget_children), function(el) {
             el.stop();
@@ -286,14 +313,23 @@ instance.base.Widget = instance.base.SessionAware.extend({
         }
         this.widget_parent = null;
     },
+    /**
+     * Inform the action manager to do an action. Of course, this suppose that
+     * the action manager can be found amongst the ancestors of the current widget.
+     * If that's not the case this method will simply return `false`.
+     */
     do_action: function(action, on_finished) {
-        return this.widget_parent.do_action(action, on_finished);
+        if (this.widget_parent) {
+            return this.widget_parent.do_action(action, on_finished);
+        }
+        return false;
     }
 });
 
-/*
- * For retro compatibility only, the only difference with is that render takes
- * directly this instead of 
+/**
+ * @deprecated
+ * For retro compatibility only, the only difference with is that render() uses
+ * directly this instead of a {widget: this}.
  */
 instance.base.OldWidget = instance.base.Widget.extend({
     render: function (additional) {

From 506e483974c164e5e682a572f8c69afa734e800c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi 
Date: Thu, 28 Jul 2011 18:18:53 +0200
Subject: [PATCH 121/167] [IMP] Integrate import into sidebar. Use fields_get
 instead of parsing views.

bzr revid: fme@openerp.com-20110728161853-21ml7wc7kgtfha45
---
 addons/base/controllers/main.py          | 32 +-----------------
 addons/base/static/src/js/data_export.js | 14 ++------
 addons/base/static/src/js/views.js       | 41 ++++++++++++++++--------
 3 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index d1917aa764b..fcf673b50d7 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -972,35 +972,6 @@ def node_attributes(node):
     return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue)
                  for i in range(attrs.length)])
 
-def _fields_get_all(req, model, views, context=None):
-
-    if context is None:
-        context = {}
-
-    def parse(root, fields):
-        for node in root.childNodes:
-            if node.nodeName in ('form', 'notebook', 'page', 'group', 'tree', 'hpaned', 'vpaned'):
-                parse(node, fields)
-            elif node.nodeName=='field':
-                attrs = node_attributes(node)
-                name = attrs['name']
-                fields[name].update(attrs)
-        return fields
-
-    def get_view_fields(view):
-        return parse(
-            xml.dom.minidom.parseString(view['arch'].encode('utf-8')).documentElement,
-            view['fields'])
-
-    model_obj = req.session.model(model)
-    tree_view = model_obj.fields_view_get(views.get('tree', False), 'tree', context)
-    form_view = model_obj.fields_view_get(views.get('form', False), 'form', context)
-    fields = {}
-    fields.update(get_view_fields(tree_view))
-    fields.update(get_view_fields(form_view))
-    return fields
-
-
 class Export(View):
     _cp_path = "/base/export"
 
@@ -1012,9 +983,8 @@ class Export(View):
     @openerpweb.jsonrequest
     def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}):
         import_compat = params.get("import_compat", False)
-        views_id = params.get("views_id", {})
 
-        fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context))
+        fields = self.fields_get(req, model)
         field_parent_type = params.get("parent_field_type",False)
 
         if import_compat and field_parent_type and field_parent_type == "many2one":
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 50a08bc4f12..ad440302c69 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,13 +1,8 @@
 openerp.base.data_export = function(openerp) {
 openerp.base.DataExport = openerp.base.Dialog.extend({
-    init: function(parent, dataset, views) {
+    init: function(parent, dataset) {
         this._super(parent);
         this.dataset = dataset;
-        this.views = views;
-        this.views_id = {};
-        for (var key in this.views) {
-            this.views_id[key] = this.views[key].view_id;
-        }
     },
     start: function() {
         var self = this;
@@ -53,8 +48,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         });
         var import_comp = self.$element.find('#import_compat option:selected').val(),
             params = {
-                import_compat: parseInt(import_comp),
-                views_id: self.views_id
+                import_compat: parseInt(import_comp)
             };
         self.rpc('/base/export/get_fields', { model: self.dataset.model, params: params }, self.on_show_data);
 
@@ -64,8 +58,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             var import_comp = self.$element.find("#import_compat option:selected").val();
             if (import_comp) {
                 var params = {
-                    import_compat: parseInt(import_comp),
-                    views_id: self.views_id
+                    import_compat: parseInt(import_comp)
                 }
                 self.rpc("/base/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
             }
@@ -172,7 +165,6 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                             var import_comp = self.$element.find("#import_compat option:selected").val();
                             var params = {
                                 import_compat: parseInt(import_comp),
-                                views_id: self.views_id,
                                 parent_field_type : record['field_type']
                             }
                             self.rpc("/base/export/get_fields", {
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 00182874c8c..687a9b25b18 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -215,19 +215,6 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
                 }
             }
         }
-        if(this.flags && this.flags.sidebar) {
-            if(this.$element.find('#exportview')){
-                this.$element.find('#exportview').remove()
-            }
-            if(this.active_view == 'list' || this.active_view == 'form') {
-                this.views[this.active_view].controller.$element.after(QWeb.render('ExportView'))
-                this.$element.find('#exportview').click(function(ev) {
-                    var export_view = new openerp.base.DataExport(self, self.dataset, self.views);
-                    export_view.start(false);
-                    ev.preventDefault();
-                });
-            }
-        }
         return view_promise;
     },
     /**
@@ -530,7 +517,6 @@ openerp.base.View = openerp.base.Widget.extend({
         this.embedded_view = embedded_view;
     },
     set_common_sidebar_sections: function(sidebar) {
-        var items = [];
         sidebar.add_section('customize', "Customize", [
             {
                 label: "Manage Views",
@@ -547,6 +533,23 @@ openerp.base.View = openerp.base.Widget.extend({
                 title: "Manage views of the current object"
             }
         ]);
+        sidebar.add_section('other', "Other Options", [
+            {
+                label: "Import",
+                callback: this.on_sidebar_import
+            }, {
+                label: "Export",
+                callback: this.on_sidebar_export
+            }, {
+                label: "Translate",
+                callback: this.on_sidebar_translate,
+                classname: 'oe_hide oe_sidebar_translate'
+            }, {
+                label: "View Log",
+                callback: this.on_sidebar_view_log,
+                classname: 'oe_hide oe_sidebar_view_log'
+            }
+        ]);
     },
     on_sidebar_manage_view: function() {
         console.log('Todo');
@@ -556,6 +559,16 @@ openerp.base.View = openerp.base.Widget.extend({
     },
     on_sidebar_customize_object: function() {
         console.log('Todo');
+    },
+    on_sidebar_import: function() {
+    },
+    on_sidebar_export: function() {
+        var export_view = new openerp.base.DataExport(this, this.dataset);
+        export_view.start(false);
+    },
+    on_sidebar_translate: function() {
+    },
+    on_sidebar_view_log: function() {
     }
 });
 

From a64f68bd2027ea6bce02156c5eeafa9e8625e638 Mon Sep 17 00:00:00 2001
From: niv-openerp 
Date: Thu, 28 Jul 2011 18:59:14 +0200
Subject: [PATCH 122/167] [imp] DOM insertion methods for Widget + doc + rpc
 stop mechanism

bzr revid: nicolas.vanhoren@openerp.com-20110728165914-6nadrs5sj00jd91j
---
 addons/base/static/src/js/controller.js | 122 ++++++++++++++++++++++--
 addons/base/static/src/js/search.js     |   4 +-
 2 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/addons/base/static/src/js/controller.js b/addons/base/static/src/js/controller.js
index 7abf35c10ed..0684f7407d2 100644
--- a/addons/base/static/src/js/controller.js
+++ b/addons/base/static/src/js/controller.js
@@ -227,6 +227,46 @@ instance.base.SessionAware = instance.base.Class.extend({
  * - Insertion in DOM.
  * 
  * Widget also extends SessionAware for ease of use.
+ * 
+ * Guide to create implementations of this class:
+ * ==============================================
+ * 
+ * Here is a sample child class:
+ * 
+ * MyWidget = openerp.base.Widget.extend({
+ *     // the name of the QWeb template to use for rendering
+ *     template: "MyQWebTemplate",
+ *     // identifier prefix, useful to put an obvious one for debugging
+ *     identifier_prefix: 'my-id-prefix-',
+ * 
+ *     init: function(parent) {
+ *         this._super(parent);
+ *         // stuff that you want to init before the rendering
+ *     },
+ *     start: function() {
+ *         // stuff you want to make after the rendering, `this.$element` holds a value
+ *         this.$element.find(".my_button").click(/* an example of event binding * /);
+ * 
+ *         // if you have some asynchronous operations, it's a good idea to return
+ *         // a promise in start()
+ *         var promise = this.rpc(...);
+ *         return promise;
+ *     }
+ * });
+ * 
+ * Now this class can simply be used with the following syntax:
+ * 
+ * var my_widget = new MyWidget(this);
+ * my_widget.appendTo($(".some-div"));
+ * 
+ * With these two lines, the MyWidget instance was inited, rendered, it was inserted into the
+ * DOM inside the ".some-div" div and its events were binded.
+ * 
+ * And of course, when you don't need that widget anymore, just do:
+ * 
+ * my_widget.stop();
+ * 
+ * That will kill the widget in a clean way and erase its content from the dom.
  */
 instance.base.Widget = instance.base.SessionAware.extend({
     /**
@@ -242,7 +282,7 @@ instance.base.Widget = instance.base.SessionAware.extend({
      * 
      * @type string
      */
-    identifier_prefix: 'generic-identifier',
+    identifier_prefix: 'generic-identifier-',
     /**
      * @constructs
      * Construct the widget and set its parent if a parent is given.
@@ -255,23 +295,74 @@ instance.base.Widget = instance.base.SessionAware.extend({
      * with the DOM insertion methods provided by the current implementation of Widget. So
      * for new components this argument should not be provided any more.
      */
-    init: function(parent, element_id) {
+    init: function(parent, /** @deprecated */ element_id) {
         this._super((parent || {}).session);
+        // if given an element_id, try to get the associated DOM element and save
+        // a reference in this.$element. Else just generate a unique identifier.
         this.element_id = element_id;
         this.element_id = this.element_id || _.uniqueId(this.identifier_prefix);
-        
         var tmp = document.getElementById(this.element_id);
         this.$element = tmp ? $(tmp) : undefined;
-        // TODO niv: wtf??
-        if (element_id) {
-            instance.screen[element_id] = this;
-        }
-        // save the parent children relationship
+        
         this.widget_parent = parent;
         this.widget_children = [];
         if(parent && parent.widget_children) {
             parent.widget_children.push(this);
         }
+        // useful to know if the widget was destroyed and should not be used anymore
+        this.widget_is_stopped = false;
+    },
+    /**
+     * Render the current widget and appends it to the given jQuery object or Widget.
+     * 
+     * @param target A jQuery object or a Widget instance.
+     */
+    appendTo: function(target) {
+        var self = this;
+        return this._render_and_insert(function(t) {
+            self.$element.appendTo(t);
+        }, target);
+    },
+    /**
+     * Render the current widget and prepends it to the given jQuery object or Widget.
+     * 
+     * @param target A jQuery object or a Widget instance.
+     */
+    prependTo: function(target) {
+        var self = this;
+        return this._render_and_insert(function(t) {
+            self.$element.prependTo(t);
+        }, target);
+    },
+    /**
+     * Render the current widget and inserts it after to the given jQuery object or Widget.
+     * 
+     * @param target A jQuery object or a Widget instance.
+     */
+    insertAfter: function(target) {
+        var self = this;
+        return this._render_and_insert(function(t) {
+            self.$element.insertAfter(t);
+        }, target);
+    },
+    /**
+     * Render the current widget and inserts it before to the given jQuery object or Widget.
+     * 
+     * @param target A jQuery object or a Widget instance.
+     */
+    insertBefore: function(target) {
+        var self = this;
+        return this._render_and_insert(function(t) {
+            self.$element.insertBefore(t);
+        }, target);
+    },
+    _render_and_insert: function(insertion, target) {
+        var rendered = this.render();
+        this.$element = $(rendered);
+        if (target instanceof instance.base.Widget)
+            target = target.$element;
+        insertion(target);
+        return this.start();
     },
     /**
      * Renders the widget using QWeb, `this.template` must be defined.
@@ -312,6 +403,7 @@ instance.base.Widget = instance.base.SessionAware.extend({
             this.widget_parent.widget_children = _.without(this.widget_parent.widget_children, this);
         }
         this.widget_parent = null;
+        this.widget_is_stopped = true;
     },
     /**
      * Inform the action manager to do an action. Of course, this suppose that
@@ -323,13 +415,25 @@ instance.base.Widget = instance.base.SessionAware.extend({
             return this.widget_parent.do_action(action, on_finished);
         }
         return false;
+    },
+    rpc: function(url, data, success, error) {
+        var def = $.Deferred().then(success, error);
+        var self = this;
+        this._super(url, data). then(function() {
+            if (!self.widget_is_stopped)
+                def.resolve.apply(def, arguments);
+        }, function() {
+            if (!self.widget_is_stopped)
+                def.reject.apply(def, arguments);
+        });
+        return def.promise();
     }
 });
 
 /**
  * @deprecated
  * For retro compatibility only, the only difference with is that render() uses
- * directly this instead of a {widget: this}.
+ * directly `this` instead of context with a "widget" key.
  */
 instance.base.OldWidget = instance.base.Widget.extend({
     render: function (additional) {
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index a63ba79355c..763746bb0bf 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -860,9 +860,7 @@ openerp.base.search.ExtendedSearch = openerp.base.OldWidget.extend({
     },
     add_group: function() {
         var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
-        var render = group.render();
-        this.$element.find('.searchview_extended_groups_list').append(render);
-        group.start();
+        group.appendTo(this.$element.find('.searchview_extended_groups_list'));
         this.check_last_element();
     },
     start: function () {

From b3b00733af3db724ab6e083f7b059227f23435fe Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 29 Jul 2011 04:47:42 +0000
Subject: [PATCH 123/167] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110726043915-2jf6htp0r7lwtog2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110727043303-c8vlizlwvgk8nbpy
bzr revid: launchpad_translations_on_behalf_of_openerp-20110729044742-d00u9akz8kbon8bv
---
 openerp/addons/base/i18n/en_GB.po |  14 +--
 openerp/addons/base/i18n/es_CL.po | 164 +++++++++++++++++++++++-------
 2 files changed, 133 insertions(+), 45 deletions(-)

diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 0ef8c396af9..2b860e51ef7 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-06-30 15:19+0000\n"
+"PO-Revision-Date: 2011-07-28 15:35+0000\n"
 "Last-Translator: John Bradshaw \n"
 "Language-Team: English (United Kingdom) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-02 05:03+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-07-29 04:47+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -212,7 +212,7 @@ msgstr "Company's Structure"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
-msgstr ""
+msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 
 #. module: base
 #: view:res.partner:0
@@ -2546,7 +2546,7 @@ msgstr "Russian Federation"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Urdu / اردو"
-msgstr ""
+msgstr "Urdu / اردو"
 
 #. module: base
 #: field:res.company,name:0
@@ -3087,7 +3087,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "Hebrew / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -3219,7 +3219,7 @@ msgstr "Custom Reports"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Abkhazian / аҧсуа"
-msgstr ""
+msgstr "Abkhazian / аҧсуа"
 
 #. module: base
 #: view:base.module.configuration:0
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index dca3c608a1a..183ebf26174 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-11 21:37+0000\n"
-"Last-Translator: doingit.cl \n"
+"PO-Revision-Date: 2011-07-26 01:09+0000\n"
+"Last-Translator: Juano \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: 2011-07-12 04:35+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-07-27 04:33+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -119,6 +119,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
+"¡No puede escribir en este documento (%s)! Asegúrese que su usuario "
+"pertenezca a alguno de los siguientes grupos: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -127,6 +129,9 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"El dominio opcional para restringir los posibles valores para los campos de "
+"relación, se especifica como una expresión Python compuesta por una lista de "
+"trios. Por ejemplo: [('color','=',' red')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -151,12 +156,15 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"¡Las propiedades de los campos base no se pueden modificar de esta forma!. "
+"Modifique las propiedades mediante código Python, preferentemente a través "
+"de un módulo (addon) personalizado."
 
 #. module: base
 #: code:addons/osv.py:133
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Error en la restricción (constraint)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -173,7 +181,7 @@ msgstr "Suazilandia"
 #: code:addons/orm.py:3653
 #, python-format
 msgid "created."
-msgstr ""
+msgstr "creado."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
@@ -828,6 +836,8 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
+"¡No se ha definido el idioma con el código \"%s\" en su sistema!\n"
+"Defínalo a través del menú de Administración."
 
 #. module: base
 #: model:res.country,name:base.gu
@@ -844,6 +854,8 @@ msgstr "Tablero de recursos humanos"
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
+"¡No se permite establecer contraseñas vacías por evidentes motivos de "
+"seguridad!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -877,7 +889,7 @@ msgstr "Transiciones"
 #: code:addons/orm.py:4020
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "¡No se ha encontrado el registro #%d de %s, no se puede copiar!"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -983,7 +995,7 @@ msgstr "Islas Marshall"
 #: code:addons/base/ir/ir_model.py:328
 #, python-format
 msgid "Changing the model of a field is forbidden!"
-msgstr ""
+msgstr "¡Está prohibido cambiar el modelo de un campo!"
 
 #. module: base
 #: model:res.country,name:base.ht
@@ -1005,6 +1017,11 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"No puede completarse la operación, probablemente debido a lo siguiente:\n"
+"- eliminación: es posible que esté intentando eliminar un registro mientras "
+"que otros registros todavía tengan referencias a el.\n"
+"- creación o actualización: un campo obligatorio no se encuentra introducido "
+"correctamente."
 
 #. module: base
 #: view:ir.rule:0
@@ -1018,7 +1035,7 @@ msgstr ""
 #: code:addons/base/res/res_user.py:206
 #, python-format
 msgid "Operation Canceled"
-msgstr ""
+msgstr "Operación Cancelada"
 
 #. module: base
 #: help:base.language.export,lang:0
@@ -1684,6 +1701,7 @@ msgstr ""
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
 msgstr ""
+"Un documento ha sido modificado desde la última vez que lo vió (%s:%d)"
 
 #. module: base
 #: view:workflow:0
@@ -1951,7 +1969,7 @@ msgstr "Pakistán"
 #: code:addons/orm.py:1350
 #, python-format
 msgid "Invalid Object Architecture!"
-msgstr ""
+msgstr "¡Estructura del objeto no válida!"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_email_gateway_form
@@ -2002,6 +2020,8 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Uno de los registros que está intentando modificar ya ha sido eliminado "
+"(tipo documento: %s)."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -2032,7 +2052,7 @@ msgstr "Koreano"
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr ""
+msgstr "El nombre técnico del modelo al que pertenece este campo."
 
 #. module: base
 #: field:ir.actions.server,action_id:0
@@ -2079,7 +2099,7 @@ msgstr "res.empresa.evento"
 #. module: base
 #: model:res.widget,title:base.facebook_widget
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. module: base
 #: model:res.country,name:base.am
@@ -2190,6 +2210,9 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"Se ha indicado un \"order\" no válido. Una especificación \"order\" válida "
+"es una lista separada por comas (CSV)de nombres de campos válidos "
+"(opcionalmente seguidos por asc/desc para indicar la dirección)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -2250,7 +2273,7 @@ msgstr "Empresa principal"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr ""
+msgstr "Archivo icono web (inmóvil)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2297,6 +2320,8 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
+"Referencia al recurso destino, cuyo modelo/tabla depende del campo 'Nombre "
+"recurso'."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -2352,7 +2377,7 @@ msgstr "Sr."
 #: code:addons/orm.py:1622
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -2647,6 +2672,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: read, Document type: %s)."
 msgstr ""
+"Operación prohibida por las reglas de acceso o a sido realizada en un "
+"documento ya eliminado (Operación: lectura, Tipo documento: %s)."
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -2737,7 +2764,7 @@ msgstr "EAN13"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "Invalid Architecture!"
-msgstr ""
+msgstr "¡Estructura no válida!"
 
 #. module: base
 #: model:res.country,name:base.pt
@@ -2997,7 +3024,7 @@ msgstr "Tipo de secuencia"
 #. module: base
 #: view:ir.ui.view.custom:0
 msgid "Customized Architecture"
-msgstr ""
+msgstr "Estructura personalizada."
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -3160,7 +3187,7 @@ msgstr "Flujos"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr ""
+msgstr "Id XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -3307,6 +3334,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"¡No puede crear este documento (%s)! Asegúrese que su usuario pertenezca a "
+"uno de los siguientes grupos: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3477,6 +3506,7 @@ msgstr "Aplicar para Eliminar"
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
+"¡No se puede renombrar la columna a %s, dado que ya existe esa columna!"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3645,6 +3675,15 @@ msgid ""
 "plugin, don't forget to register emails to each contact so that the gateway "
 "will automatically attach incoming emails to the right partner."
 msgstr ""
+"Un cliente es una entidad con quien hace o realiza negocios, como una "
+"empresa o una organización. Un cliente puede tener varios contactos o "
+"direcciones que pueden ser las personas que trabajan para esta empresa. "
+"Puede utilizar la pestaña historial para seguir todas las transacciones "
+"relacionadas con un cliente como por ejemplo: pedidos de venta, correos "
+"electrónicos, oportunidades, reclamaciones, etc. Si utiliza la pasarela de "
+"correo electrónico, el conector Outlook o Thunderbird, no olvide introducir "
+"el correo electrónico de cada contacto de modo que la pasarela adjuntará "
+"automáticamente los correos electrónicos entrantes a la empresa correcta."
 
 #. module: base
 #: field:ir.actions.report.xml,name:0
@@ -3695,6 +3734,8 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
+"La expresión de opciones de selección no es una expresión \"Pythonica\" "
+"válida. Proporcione una expresión en el formato [('clave', 'Etiqueta'), ...]."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -4028,6 +4069,8 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
+"Si los valores de este campo se pueden traducir (activa el mecanismo de "
+"traducción para este campo)."
 
 #. module: base
 #: view:res.lang:0
@@ -4365,6 +4408,9 @@ msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
+"No puede realizar esta operación. La creación de nuevos registros no está "
+"permitida para este objeto ya que este objeto tiene como finalidad la "
+"generación de informes o reportes."
 
 #. module: base
 #: view:base.language.import:0
@@ -4389,7 +4435,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr ""
+msgstr "Para campos de relación, el nombre técnico del modelo destino."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4414,7 +4460,7 @@ msgstr "Proyecto"
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Imagen de icono web (inmóvil)"
 
 #. module: base
 #: view:base.module.import:0
@@ -4637,6 +4683,8 @@ msgstr "Contactos"
 msgid ""
 "Unable to delete this document because it is used as a default property"
 msgstr ""
+"No se ha podido eliminar este documento ya que se utiliza como una propiedad "
+"por defecto."
 
 #. module: base
 #: view:res.widget.wizard:0
@@ -4672,6 +4720,10 @@ msgid ""
 "OpenERP. They are launched during the installation of new modules, but you "
 "can choose to restart some wizards manually from this menu."
 msgstr ""
+"Los asistentes de configuración se utilizan para ayudarle a configurar una "
+"nueva instalación de OpenERP. Son ejecutados durante la instalación de "
+"nuevos módulos, pero desde este menú, usted puede seleccionar algunos "
+"asistentes para ejecutarlos manualmente."
 
 #. module: base
 #: code:addons/base/res/res_user.py:206
@@ -4680,12 +4732,14 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
+"Utilice el \"asistente de cambio de contraseña\" (en Preferencias de usuario "
+"o menú Usuario) para cambiar su propia contraseña."
 
 #. module: base
 #: code:addons/orm.py:1350
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr ""
+msgstr "¡Campos insuficientes para la vista calendario!"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -5104,7 +5158,7 @@ msgstr "Acciones cliente"
 #: code:addons/orm.py:1806
 #, python-format
 msgid "The exists method is not implemented on this object !"
-msgstr ""
+msgstr "¡El método exists no se encuentra implementado en este objeto!"
 
 #. module: base
 #: code:addons/base/module/module.py:336
@@ -5237,7 +5291,7 @@ msgstr "Usuarios aceptados"
 #. module: base
 #: field:ir.ui.menu,web_icon_data:0
 msgid "Web Icon Image"
-msgstr ""
+msgstr "Imagen de icono web"
 
 #. module: base
 #: view:ir.values:0
@@ -5367,6 +5421,8 @@ msgid ""
 "Invalid value for reference field \"%s\" (last part must be a non-zero "
 "integer): \"%s\""
 msgstr ""
+"Valor no válido para el campo referencia \"%s\" (la última parte debe ser un "
+"entero distinto de cero): \"%s\""
 
 #. module: base
 #: help:ir.cron,args:0
@@ -5389,7 +5445,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_action_ui_view_custom
 #: view:ir.ui.view.custom:0
 msgid "Customized Views"
-msgstr ""
+msgstr "Vistas Personalizadas"
 
 #. module: base
 #: view:partner.sms.send:0
@@ -5443,7 +5499,7 @@ msgstr "Tailandés / ภาษาไทย"
 #: code:addons/orm.py:158
 #, python-format
 msgid "Object %s does not exists"
-msgstr ""
+msgstr "El objeto %s no existe"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5603,6 +5659,8 @@ msgstr "Reunión (Francesa)"
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
 msgstr ""
+"¡El nuevo nombre de columna debe empezar con x_ , dado que es un campo "
+"personalizado!"
 
 #. module: base
 #: view:ir.model.access:0
@@ -6249,7 +6307,7 @@ msgstr "res.log"
 #: help:ir.translation,module:0
 #: help:ir.translation,xml_id:0
 msgid "Maps to the ir_model_data for which this translation is provided."
-msgstr ""
+msgstr "Mapeo hacia el ir_model_data cuya traducción se proporciona."
 
 #. module: base
 #: view:workflow.activity:0
@@ -6570,6 +6628,8 @@ msgid ""
 "You can not read this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"¡No puede leer este documento: (%s)!. Asegúrese que su usuario pertenezca a "
+"alguno de los siguientes grupos: %s."
 
 #. module: base
 #: view:res.bank:0
@@ -6675,6 +6735,8 @@ msgid ""
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
 msgstr ""
+"Las vistas personalizadas se utilizan cuando los usuarios reorganizan el "
+"contenido de sus vistas de tablero (mediante el cliente web)."
 
 #. module: base
 #: field:ir.model,name:0
@@ -6713,7 +6775,7 @@ msgstr "Icono"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr ""
+msgstr "El modelo al que pertenece este campo."
 
 #. module: base
 #: model:res.country,name:base.mq
@@ -6747,7 +6809,7 @@ msgstr "O"
 #: model:ir.actions.act_window,name:base.res_log_act_window
 #: model:ir.ui.menu,name:base.menu_res_log_act_window
 msgid "Client Logs"
-msgstr ""
+msgstr "Registros de cliente(s)"
 
 #. module: base
 #: model:res.country,name:base.al
@@ -6885,7 +6947,7 @@ msgstr "Todo parado"
 #: code:addons/orm.py:412
 #, python-format
 msgid "The read_group method is not implemented on this object !"
-msgstr ""
+msgstr "¡El método read_group no está implementado en este objeto!"
 
 #. module: base
 #: view:ir.model.data:0
@@ -7141,7 +7203,7 @@ msgstr ""
 #: code:addons/osv.py:156
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Error de integridad."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_wizard_screen
@@ -7191,7 +7253,7 @@ msgstr "Argumentos"
 #: code:addons/orm.py:716
 #, python-format
 msgid "Database ID doesn't exist: %s : %s"
-msgstr ""
+msgstr "No existe el ID de la base de datos: %s : %s"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -7207,7 +7269,7 @@ msgstr "GPL Versión 3"
 #: code:addons/orm.py:836
 #, python-format
 msgid "key '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "No se ha encontrado la clave '%s' en el campo selección '%s'"
 
 #. module: base
 #: view:partner.wizard.ean.check:0
@@ -7316,7 +7378,7 @@ msgstr "Cancelar instalación"
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "Opciones de Selección"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
@@ -7394,6 +7456,9 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[objeto con referencia: %s - %s]"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_default
@@ -7433,6 +7498,8 @@ msgid ""
 "Changing the type of a column is not yet supported. Please drop it and "
 "create it again!"
 msgstr ""
+"El cambio de tipo de una columna todavía no está soportado. ¡Elimine la "
+"columna y créela de nuevo!"
 
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
@@ -7448,7 +7515,7 @@ msgstr "¡Aviso!"
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
 msgid "Google Maps"
-msgstr ""
+msgstr "Google Maps"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -7745,7 +7812,7 @@ msgstr "workflow.instancia"
 #: code:addons/orm.py:278
 #, python-format
 msgid "Unknown attribute %s in %s "
-msgstr ""
+msgstr "Atributo desconocido %s en %s "
 
 #. module: base
 #: view:res.lang:0
@@ -7770,6 +7837,9 @@ msgid ""
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
+"Introduzca un valor si desea cambiar la contraseña del usuario. ¡Este "
+"usuario deberá encontrarse desconectado o desconectarse (si se encontrase "
+"conectado) y posteriormente volverse a conectar!"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7795,7 +7865,7 @@ msgstr "Fichero binario de URL externa"
 #: field:res.config.users,new_password:0
 #: field:res.users,new_password:0
 msgid "Change password"
-msgstr ""
+msgstr "Cambiar la Contraseña"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -7830,6 +7900,11 @@ msgid ""
 "button \"Schedule for Installation\" from the form view, then click on "
 "\"Apply Scheduled Upgrades\" to migrate your system."
 msgstr ""
+"Puede instalar nuevos módulos para activar nuevas características, menús, "
+"informes o datos en su instalación de OpenERP. Para instalar nuevos módulos, "
+"haga clic en el botón \"Programar para instalación\" desde la vista "
+"formulario, y luego haga clic en \"Aplicar actualizaciones programadas\" "
+"para actualizar su sistema."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_emails
@@ -8107,6 +8182,8 @@ msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
+"¡La expresión de opciones de selección debe estar en el formato "
+"[('clave','Etiqueta'), ...]!"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -8367,6 +8444,8 @@ msgid ""
 "Operation prohibited by access rules, or performed on an already deleted "
 "document (Operation: %s, Document type: %s)."
 msgstr ""
+"Operación prohibida por las reglas de acceso o la operación a sido realizada "
+"en un documento ya eliminado (Operación: %s, Tipo documento: %s)."
 
 #. module: base
 #: model:res.country,name:base.zr
@@ -8564,7 +8643,7 @@ msgstr "Danés / Dansk"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr ""
+msgstr "Búsqueda Avanzada (obsoleto)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -8702,6 +8781,8 @@ msgid ""
 "Invalid group_by specification: \"%s\".\n"
 "A group_by specification must be a list of valid fields."
 msgstr ""
+"La especificación group_by no es válida: \"%s\".\n"
+"Una especificación group_by debe contener una lista de campos válidos."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -8967,7 +9048,7 @@ msgstr "Recurso"
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Archivo de icono web"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9001,6 +9082,8 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
+"¡No puede eliminar este documento (%s)! Asegúrese que su usuario pertenezca "
+"a alguno de los siguientes grupos: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -9169,6 +9252,11 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"Puede acceder a toda la información relacionada con sus proveedores desde el "
+"formulario de proveedor como por ejemplo: Datos contables, historial de "
+"correos, reuniones, compras, etc. Puede desmarcar el botón de filtrado "
+"'Proveedores' para buscar en todas sus empresas, incluyendo clientes y "
+"clientes potenciales."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -9301,7 +9389,7 @@ msgstr "Vertical"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "¡Sólo puede renombrar una sola columna a la vez!"
 
 #. module: base
 #: selection:ir.translation,type:0

From c86be456239ef38d3a32201d6c42e0fe08b80720 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" 
Date: Fri, 29 Jul 2011 16:50:19 +0530
Subject: [PATCH 124/167] [FIX]:--debug option

lp bug: https://launchpad.net/bugs/815779 fixed

bzr revid: nch@tinyerp.com-20110729112019-yu4cbcgsmnph3iaz
---
 openerp/netsvc.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 3a2add26421..359813e7d41 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -95,8 +95,8 @@ class Service(object):
             raise
 
 class LocalService(object):
-    """ Proxy for local services. 
-    
+    """ Proxy for local services.
+
         Any instance of this class will behave like the single instance
         of Service(name)
     """
@@ -115,20 +115,20 @@ class LocalService(object):
         return getattr(self, method)(*params)
 
 class ExportService(object):
-    """ Proxy for exported services. 
+    """ Proxy for exported services.
 
     All methods here should take an AuthProxy as their first parameter. It
     will be appended by the calling framework.
 
-    Note that this class has no direct proxy, capable of calling 
-    eservice.method(). Rather, the proxy should call 
+    Note that this class has no direct proxy, capable of calling
+    eservice.method(). Rather, the proxy should call
     dispatch(method,auth,params)
     """
-    
+
     _services = {}
     _groups = {}
     _logger = logging.getLogger('web-services')
-    
+
     def __init__(self, name, audience=''):
         ExportService._services[name] = self
         self.__name = name
@@ -143,7 +143,7 @@ class ExportService(object):
 
     def dispatch(self, method, auth, params):
         raise Exception("stub dispatch at %s" % self.__name)
-        
+
     def new_dispatch(self,method,auth,params):
         raise Exception("stub dispatch at %s" % self.__name)
 
@@ -247,16 +247,16 @@ def init_alternative_logger():
 class Agent(object):
     """ Singleton that keeps track of cancellable tasks to run at a given
         timestamp.
-       
+
         The tasks are characterised by:
-       
+
             * a timestamp
             * the database on which the task run
             * the function to call
             * the arguments and keyword arguments to pass to the function
 
         Implementation details:
-        
+
           - Tasks are stored as list, allowing the cancellation by setting
             the timestamp to 0.
           - A heapq is used to store tasks, so we don't need to sort
@@ -357,7 +357,7 @@ class Server:
 
     def start(self):
         self.__logger.debug("called stub Server.start")
-        
+
     def _late_start(self):
         self.start()
         for thr in Server.__starter_threads:
@@ -449,7 +449,7 @@ class OpenERPDispatcher:
             self.log('exception', tools.exception_to_unicode(e))
             tb = getattr(e, 'traceback', sys.exc_info())
             tb_s = "".join(traceback.format_exception(*tb))
-            if tools.config['debug_mode'] and isinstance(tb, types.TracebackType):
+            if tools.config['debug_mode'] and isinstance(tb[2], types.TracebackType):
                 import pdb
                 pdb.post_mortem(tb[2])
             raise OpenERPDispatcherException(e, tb_s)

From 0111cf3fd5c94c929e3196ff73a83715ff675af8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse 
Date: Fri, 29 Jul 2011 14:40:16 +0200
Subject: [PATCH 125/167] [IMP] rename controller.js to core.js

bzr revid: al@openerp.com-20110729124016-gvtayplemywiyh0a
---
 addons/base/__openerp__.py                    |   6 +-
 addons/base/static/src/js/boot.js             |   2 +-
 addons/base/static/src/js/chrome.js           | 133 ---------------
 .../static/src/js/{controller.js => core.js}  | 155 ++++++++++++++++--
 4 files changed, 146 insertions(+), 150 deletions(-)
 rename addons/base/static/src/js/{controller.js => core.js} (75%)

diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index c8c80cd2e3a..b93e4036f8e 100644
--- a/addons/base/__openerp__.py
+++ b/addons/base/__openerp__.py
@@ -18,17 +18,17 @@
         "static/lib/underscore/underscore.js",
         "static/lib/underscore/underscore.string.js",
         "static/src/js/boot.js",
+        "static/src/js/core.js",
+        "static/src/js/dates.js",
         "static/src/js/chrome.js",
-        "static/src/js/controller.js",
         "static/src/js/views.js",
         "static/src/js/data.js",
-        "static/src/js/dates.js",
+        "static/src/js/data_export.js",
         "static/src/js/form.js",
         "static/src/js/list.js",
         "static/src/js/list-editable.js",
         "static/src/js/search.js",
         "static/src/js/view_tree.js",
-        "static/src/js/data_export.js",
     ],
     'css' : [
         "static/lib/jquery.superfish/css/superfish.css",
diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js
index 5f86a73ed5e..c16f2d261f5 100644
--- a/addons/base/static/src/js/boot.js
+++ b/addons/base/static/src/js/boot.js
@@ -58,7 +58,7 @@
 //---------------------------------------------------------
 
 openerp.base = function(instance) {
-    openerp.base.controller(instance);
+    openerp.base.core(instance);
     openerp.base.dates(instance);
     openerp.base.chrome(instance);
     openerp.base.data(instance);
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 41a17d37d94..ed84c32071b 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -4,139 +4,6 @@
 
 openerp.base.chrome = function(openerp) {
 
-/**
- * Base error for lookup failure
- *
- * @class
- */
-openerp.base.NotFound = openerp.base.Class.extend( /** @lends openerp.base.NotFound# */ {
-});
-openerp.base.KeyNotFound = openerp.base.NotFound.extend( /** @lends openerp.base.KeyNotFound# */ {
-    /**
-     * Thrown when a key could not be found in a mapping
-     *
-     * @constructs
-     * @extends openerp.base.NotFound
-     * @param {String} key the key which could not be found
-     */
-    init: function (key) {
-        this.key = key;
-    },
-    toString: function () {
-        return "The key " + this.key + " was not found";
-    }
-});
-openerp.base.ObjectNotFound = openerp.base.NotFound.extend( /** @lends openerp.base.ObjectNotFound# */ {
-    /**
-     * Thrown when an object path does not designate a valid class or object
-     * in the openerp hierarchy.
-     *
-     * @constructs
-     * @extends openerp.base.NotFound
-     * @param {String} path the invalid object path
-     */
-    init: function (path) {
-        this.path = path;
-    },
-    toString: function () {
-        return "Could not find any object of path " + this.path;
-    }
-});
-openerp.base.Registry = openerp.base.Class.extend( /** @lends openerp.base.Registry# */ {
-    /**
-     * Stores a mapping of arbitrary key (strings) to object paths (as strings
-     * as well).
-     *
-     * Resolves those paths at query time in order to always fetch the correct
-     * object, even if those objects have been overloaded/replaced after the
-     * registry was created.
-     *
-     * An object path is simply a dotted name from the openerp root to the
-     * object pointed to (e.g. ``"openerp.base.Session"`` for an OpenERP
-     * session object).
-     *
-     * @constructs
-     * @param {Object} mapping a mapping of keys to object-paths
-     */
-    init: function (mapping) {
-        this.map = mapping || {};
-    },
-    /**
-     * Retrieves the object matching the provided key string.
-     *
-     * @param {String} key the key to fetch the object for
-     * @returns {Class} the stored class, to initialize
-     *
-     * @throws {openerp.base.KeyNotFound} if the object was not in the mapping
-     * @throws {openerp.base.ObjectNotFound} if the object path was invalid
-     */
-    get_object: function (key) {
-        var path_string = this.map[key];
-        if (path_string === undefined) {
-            throw new openerp.base.KeyNotFound(key);
-        }
-
-        var object_match = openerp;
-        var path = path_string.split('.');
-        // ignore first section
-        for(var i=1; i
Date: Fri, 29 Jul 2011 19:04:55 +0530
Subject: [PATCH 126/167] [FIXED] Fixed the problem keyerror id

bzr revid: gpa@tinyerp.com-20110729133455-oed1zbu6qv9aa4uo
---
 openerp/osv/orm.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 48d66f30e32..3aee2ec1899 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1555,8 +1555,10 @@ class orm_template(object):
                             attrs['selection'].append((False, ''))
                 fields[node.get('name')] = attrs
 
-                field = model_fields[node.get('name')]
-                transfer_field_to_modifiers(field, modifiers)
+                field = model_fields.get(node.get('name'))
+                if field:
+                    transfer_field_to_modifiers(field, modifiers)
+ 
 
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)

From 795916ea2ad5068adbe498dacefd3b45b6e381b0 Mon Sep 17 00:00:00 2001
From: niv-openerp 
Date: Fri, 29 Jul 2011 16:01:06 +0200
Subject: [PATCH 127/167] [fix] forgot call to parent start() in viewManager

bzr revid: nicolas.vanhoren@openerp.com-20110729140106-et5tlhkfk90tzbxh
---
 addons/base/static/src/js/views.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 687a9b25b18..7e95ff67f83 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -129,6 +129,7 @@ openerp.base.ViewManager =  openerp.base.Widget.extend({
      * @returns {jQuery.Deferred} initial view loading promise
      */
     start: function() {
+        this._super();
         var self = this;
         this.dataset.start();
         this.$element.html(QWeb.render("ViewManager", {"prefix": this.element_id, views: this.views_src}));

From 1bb79ca921e657f89608ae249d39248622b3e7af Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 1 Aug 2011 04:39:43 +0000
Subject: [PATCH 128/167] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110730050033-h7utz09178tvvetl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110731043831-gj2tw6sdh1e8sf34
bzr revid: launchpad_translations_on_behalf_of_openerp-20110801043943-wwcxg26n160r0o21
---
 addons/account_followup/i18n/ca.po       |  167 +++-
 addons/account_invoice_layout/i18n/vi.po |   32 +-
 addons/crm/i18n/ca.po                    | 1088 +++++++++++++---------
 addons/multi_company/i18n/pt.po          |   16 +-
 addons/purchase/i18n/vi.po               |    6 +-
 addons/survey/i18n/pt.po                 |   88 +-
 addons/web_livechat/i18n/pt.po           |   41 +
 7 files changed, 858 insertions(+), 580 deletions(-)
 create mode 100644 addons/web_livechat/i18n/pt.po

diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index 56dc36efb4d..62757a3b0e0 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -7,26 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-10-30 13:46+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2011-07-29 13:34+0000\n"
+"Last-Translator: mgaja (GrupoIsep.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: 2011-04-29 05:02+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-30 05:00+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:295
+#: code:addons/account_followup/wizard/account_followup_print.py:298
 #, python-format
 msgid "Follwoup Summary"
-msgstr ""
+msgstr "Informe de seguiment"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "Cerca de seguiment"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -52,11 +51,34 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    Mòdul per automatitzar cartes de factures impagades, amb recordatoris "
+"multi-nivell.\n"
+"\n"
+"    Podeu definir els múltiples nivells de recordatoris a través del menú:\n"
+"        Comptabilitat/Configuració/Miscel·lanis/Recordatoris\n"
+"\n"
+"    Una vegada definit, podeu automatitzar la impressió de recordatoris cada "
+"dia\n"
+"    fent clic en el menú:\n"
+"        Comptabilitat/Processos periòdics/Facturació/Envia recordatoris\n"
+"\n"
+"    Es generarà un PDF amb totes les cartes en funció dels\n"
+"    diferents nivells de recordatoris definits. Podeu definir diferents "
+"regles\n"
+"    per a diferents empreses. Podeu també enviar un correu electrònic al "
+"client.\n"
+"\n"
+"    Tingueu en compte que si voleu modificar els nivells de recordatoris per "
+"a una empresa/anotació comptable, ho podeu fer des del menú:\n"
+"        Comptabilitat/Informis/Informes genèrics/Expliques "
+"empreses/Recordatoris enviats\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -98,6 +120,7 @@ msgstr "Assumpte correu electrònic"
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
 msgstr ""
+"Seguiment dels recordatoris enviats als seus clients per factures no pagades."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -113,12 +136,12 @@ msgstr "D'acord"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Selecciona empreses per recordar"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "No podeu crear una anotació en un compte tancat."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
@@ -128,7 +151,7 @@ msgstr "Data enviament del seguiment"
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valor erroni del deure o haver en l'assentament comptable !"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -144,7 +167,7 @@ msgstr "Seguiments"
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Balanç > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -193,12 +216,12 @@ msgstr "Empreses"
 #: code:addons/account_followup/wizard/account_followup_print.py:138
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "Recordatori de factures"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "Seguiment comptable"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -208,7 +231,7 @@ msgstr "Fi de mes"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "Sense litigi"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -227,6 +250,10 @@ msgid ""
 "You can send them the default message for unpaid invoices or manually enter "
 "a message should you need to remind them of a specific information."
 msgstr ""
+"Aquesta funcionalitat li permet enviar recordatoris a les empreses amb "
+"factures pendents. Podeu enviar el missatge per defecte per les factures "
+"impagades o introduir manualment un missatge si necessiteu recordar alguna "
+"informació específica."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -237,6 +264,8 @@ msgstr "Ref."
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
 msgstr ""
+"Indica l'ordre de seqüència quan es mostra una llista de seguiment de les "
+"línies."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -278,6 +307,25 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Benvolgut %(partner_name)s,\n"
+"\n"
+"Estem preocupats de veure que, malgrat enviar un recordatori, els pagaments "
+"del seu compte estan molt endarrerits.\n"
+"\n"
+"És essencial que realitzi el pagament de forma immediata, en cas contrari "
+"haurà de considerar la suspensió del seu compte, la qual cosa significa que "
+"no serem capaços de subministrar a la seva empresa.\n"
+"Si us plau, prengui les mesures oportunes per dur a terme aquest pagament en "
+"els propers 8 dies.\n"
+"\n"
+"Si hi ha un problema amb el pagament de la(es) factura(es) que desconeixem, "
+"no dubti a posar-se en contacte amb el nostre departament de comptabilitat "
+"de manera que puguem resoldre l'assumpte el més ràpid possible.\n"
+"\n"
+"Els detalls dels pagaments pendents es llisten a continuació.\n"
+"\n"
+"Salutacions cordials,\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
@@ -312,7 +360,7 @@ msgstr "Envia seguiments"
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "Empresa per recordar"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -336,6 +384,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Benvolgut %(*partner_*name)s,\n"
+"\n"
+"Excepte si hi hagués un error per part nostre, sembla que els següents "
+"imports estan pendents de pagament. Si us plau, prengui les mesures "
+"oportunes per dur a terme aquest pagament en els propers 8 dies.\n"
+"\n"
+"Si el pagament hagués estat realitzat després d'enviar aquest correu, si us "
+"plau no ho tingui en compte. No dubti a posar-se en contacte amb el nostre "
+"departament de comptabilitat.\n"
+"\n"
+"Salutacions cordials,\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -356,21 +416,37 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Benvolgut %(partner_name)s,\n"
+"\n"
+"Malgrat diversos recordatoris, el deute del seu compte encara no està "
+"resolt.\n"
+"\n"
+"Tret que el pagament total es realitzi en els propers 8 dies, les accions "
+"legals per al cobrament del deute es prendran sense previ avís.\n"
+"\n"
+"Confiem que aquesta mesura sigui innecessària. Els detalls dels pagaments "
+"pendents es llisten a continuació.\n"
+"\n"
+"En cas de qualsevol consulta relacionada amb aquest tema, no dubti en "
+"contactar amb el nostre departament de comptabilitat.\n"
+"\n"
+"Salutacions cordials,\n"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Envia emails"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Currency"
-msgstr ""
+msgstr "Divisa"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "Estadístiques de seguiment per empresa"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
@@ -380,7 +456,7 @@ msgstr "Gestió dels seguiments/avisos comptables"
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloquejat"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -399,7 +475,7 @@ msgstr "Degut"
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Selecciona empreses"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -409,7 +485,7 @@ msgstr "Configuracions email"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr ""
+msgstr "Imprimeix els seguiments"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -429,7 +505,7 @@ msgstr "Saldo pendent:"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr ""
+msgstr "Estadístiques de seguiment"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -439,17 +515,18 @@ msgstr "Pagat"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(user_signature)s: Nom d'usuari/a"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Apunts comptables"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
 msgstr ""
+"La companyia ha de ser la mateixa per al compte i període relacionats."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -468,7 +545,7 @@ msgstr ""
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No podeu crear companyies recursives."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -478,12 +555,12 @@ msgstr "%(company_name): Nom de la companyia de l'usuari"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr ""
+msgstr "Línies de seguiment"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -498,7 +575,7 @@ msgstr "Data venciment"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: Nom d'empresa"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -526,7 +603,7 @@ msgstr "Tipus de termini"
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Followup & Send Mail to Customers"
-msgstr ""
+msgstr "Imprimeix seguiment i envia correu als clients"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -542,7 +619,7 @@ msgstr "Informe de seguiments"
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Període"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -558,17 +635,17 @@ msgstr "Línies de seguiment"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr ""
+msgstr "Litigi"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr ""
+msgstr "Nivell màxim de seguiment"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "Registres a pagar"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -584,7 +661,7 @@ msgstr "%(date)s: Data actual"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr ""
+msgstr "Nivell de seguiment"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -596,7 +673,7 @@ msgstr "Descripció"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "Aquest exercici fiscal"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -609,18 +686,20 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"No canvieu el text del missatge, si voleu enviar un correu electrònic en el "
+"llenguatge associat o configurar-ho des de la companyia"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr ""
+msgstr "Registres a cobrar"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-ups Sent"
-msgstr ""
+msgstr "Seguiments enviats"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -682,7 +761,7 @@ msgstr "Total haver"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr ""
+msgstr "%(line)s: Línies incloses en el llibre major"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -692,7 +771,7 @@ msgstr "Seqüència"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s: Nom de la companyia de l'usuari"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -707,17 +786,17 @@ msgstr "%(partner_name)s: Nom empresa"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr ""
+msgstr "Data del últim seguiment"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr ""
+msgstr "Criteris de seguiment"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No podeu crear un apunt en un compte de tipus \"Vista\"."
 
 #~ msgid "All payable entries"
 #~ msgstr "Tots els assentaments comptes a pagar"
diff --git a/addons/account_invoice_layout/i18n/vi.po b/addons/account_invoice_layout/i18n/vi.po
index c6d033420a3..83f860cfbbd 100644
--- a/addons/account_invoice_layout/i18n/vi.po
+++ b/addons/account_invoice_layout/i18n/vi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-15 16:38+0000\n"
+"PO-Revision-Date: 2011-07-31 06:17+0000\n"
 "Last-Translator: Phong Nguyen-Thanh \n"
 "Language-Team: Vietnamese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:22+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-08-01 04:39+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -98,7 +98,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr "Thuế GTGT"
+msgstr "Thuế GTGT :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -110,17 +110,17 @@ msgstr "Điện thoại :"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "Hoá đơn chiếu lệ"
 
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Các dòng Hóa đơn"
 
 #. module: account_invoice_layout
 #: view:account.invoice.line:0
 msgid "Seq."
-msgstr ""
+msgstr "Thứ tự"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
@@ -153,7 +153,7 @@ msgstr "Giá"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr "Ngày hóa đơn"
+msgstr "Ngày Hóa đơn"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -174,7 +174,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "Gốc"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -185,12 +185,12 @@ msgstr "Phân trang"
 #: view:notify.message:0
 #: field:notify.message,msg:0
 msgid "Special Message"
-msgstr ""
+msgstr "Thông điệp Đặc biệt"
 
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr ""
+msgstr "Thông điệp In vào cuối báo cáo"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -250,12 +250,12 @@ msgstr "Các giải pháp ERP & CRM"
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Tổng số thực :"
 
 #. module: account_invoice_layout
 #: report:notify_account.invoice:0
 msgid "Total :"
-msgstr ""
+msgstr "Tổng :"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -266,7 +266,7 @@ msgstr "Hóa đơn nháp"
 #. module: account_invoice_layout
 #: field:account.invoice.line,sequence:0
 msgid "Sequence Number"
-msgstr ""
+msgstr "Số thứ tự"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
@@ -304,7 +304,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Supplier Invoice"
-msgstr "Hóa đơn nhà cung cấp"
+msgstr "Hóa đơn Nhà cung cấp"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -320,7 +320,7 @@ msgstr "Thuế"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Dòng Hóa đơn"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index f57fcbd7937..ded994a38c2 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -7,79 +7,78 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-30 07:50+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2011-07-31 09:43+0000\n"
+"Last-Translator: mgaja (GrupoIsep.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: 2011-04-29 04:57+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-08-01 04:39+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "Núm. iniciatives"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "Necessita serveis"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensual"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Schedule a PhoneCall"
-msgstr ""
+msgstr "Planifica trucada telefònica"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Etapa del cas"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr ""
+msgstr "Visibilitat"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr ""
+msgstr "Títol"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Mostra com"
 
 #. module: crm
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Today"
-msgstr ""
+msgstr "Avui"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "Selecciona oportunitats"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -87,29 +86,29 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Retard a tancar"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Etapa anterior"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "No es pot afegir una nota!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nom de la fase"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -117,33 +116,33 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "El codi de l'equip de vendes ha de ser únic!"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:95
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr ""
+msgstr "La iniciativa '%s' ha estat convertida en oportunitat"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:228
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "La iniciativa '%s' ha estat tancada"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "No repeteix"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #: code:addons/crm/wizard/crm_lead_to_partner.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
@@ -153,7 +152,7 @@ msgstr "Atenció!"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Anual"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -168,17 +167,17 @@ msgstr "Nom de regla"
 #: field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr ""
+msgstr "Campanya"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "No creeu una empresa"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Cerca d'oportunitats"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@@ -186,20 +185,22 @@ msgstr ""
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
+"L'oportunitat ha de tenir una empresa assignada abans de fusionar-la amb una "
+"altra oportunitat."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
 #: code:addons/crm/wizard/crm_merge_opportunities.py:53
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avís!"
 
 #. 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 ""
+msgstr "Anàlisi d'oportunitats"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -226,7 +227,7 @@ msgstr "Empresa"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organitzador"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -234,12 +235,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 #: view:res.partner:0
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Planifica una altra trucada"
 
 #. module: crm
 #: help:crm.meeting,edit_all:0
 msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr ""
+msgstr "Edita totes les ocurrències de la reunió recurrent."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
@@ -250,18 +251,18 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Trucada telefònica"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "No accepta rebre emails"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "L'oportunitat '%s' ha estat marcada com perduda."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -271,11 +272,15 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"L'anàlisi d'iniciatives li permet verificar informació relacionada amb el "
+"CRM. Podeu verificar els retards, el número de respostes realitzades i el "
+"número d'emails enviats. Podeu ordenar l'anàlisi de les seves iniciatives "
+"segons diferents grups per obtenir un anàlisi reagrupat precís."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Envia nou correu electrònic"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -295,14 +300,14 @@ msgstr "Seccions"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "_Fusiona"
 
 #. 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 ""
+msgstr "Anàlisi d'iniciatives"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -311,17 +316,20 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
+"Si seleccioneu fusionar amb oportunitat existent, els detalls de la "
+"iniciativa (amb l'històric de la comunicació) seran fusionats amb "
+"l'oportunitat existent de l'empresa seleccionada"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Públic"
 
 #. 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 ""
+msgstr "Campanyes"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -333,7 +341,7 @@ msgstr "Categories"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Forever"
-msgstr ""
+msgstr "Sempre"
 
 #. module: crm
 #: help:crm.lead,optout:0
@@ -341,83 +349,86 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Si opt-out està marcat, aquest contacte ha rebutjat rebre correus "
+"electrònics o ha eliminat la seva subscripció a una campanya."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Soci prospecte"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nom del contacte"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Enllaç a l'empresa existent"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: field:crm.phonecall,partner_contact:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Enhance your core CRM Application with additional functionalities."
 msgstr ""
+"Milloreu la seva aplicació CRM bàsica amb funcionalitats addicionals."
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "Canviar la probabilitat automàticament"
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Expressions regulars en l'històric del cas"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:209
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "La iniciativa '%s' ha estat oberta."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Reunió oportunitat"
 
 #. 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 ""
+msgstr "Número de dies per tancar el cas"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Quan un projecte/oportunitat real és detectat"
 
 #. module: crm
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
-msgstr ""
+msgstr "Recaptació de fons"
 
 #. module: crm
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats"
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send"
-msgstr ""
+msgstr "_Envia"
 
 #. module: crm
 #: view:crm.lead:0
@@ -427,12 +438,12 @@ msgstr "Comunicació"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Change Responsible"
-msgstr ""
+msgstr "Canvia responsable"
 
 #. module: crm
 #: field:crm.merge.opportunity,state:0
 msgid "Set State To"
-msgstr ""
+msgstr "Canvia estat a"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -443,22 +454,27 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Trucades sortints mostra totes les trucades realitzades pel seu equip de "
+"vendes. Un venedor pot gravar la informació sobre la trucada en la vista de "
+"formulari. Aquesta informació s'emmagatzemarà en el formulari d'empresa per "
+"rastrejar cada contacte que tingueu amb un client. També podeu importar un "
+"fitxer .CSV amb una llista de trucades a realitzar pel seu equip de vendes."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr ""
+msgstr "Converteix/Fusiona oportunitat"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data d'actualització"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Selecciona acció"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -476,37 +492,37 @@ msgstr "Categoria"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "nº oportunitats"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "Campanya 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "Campanya 2"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacitat"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Anàlisi d'oportunitats"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Localització de l'esdeveniment"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regla recurrent"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -521,23 +537,23 @@ msgstr ""
 #. module: crm
 #: help:crm.installer,fetchmail:0
 msgid "Allows you to receive E-Mails from POP/IMAP server."
-msgstr ""
+msgstr "Li permet rebre e-mails des d'un servidor POP/IMAP"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Reunió normal o telefònica per a oportunitat"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Primer contacte amb el nou prospecte"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:197
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:231
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:299
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -545,12 +561,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 #, python-format
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Crea oportunitat"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: crm
 #: code:addons/crm/crm.py:378
@@ -570,7 +586,7 @@ msgstr "Gestió de relacions amb clients & proveïdors"
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -581,17 +597,17 @@ msgstr "No executat"
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "Respondre a l'últim e-mail"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "Correu electrònic"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "FAQ de vendes"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
@@ -603,7 +619,7 @@ msgstr ""
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -614,13 +630,13 @@ msgstr "Respostes incloses:"
 #: help:crm.meeting,email_from:0
 #: help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Aquestes persones rebran un correu electrònic."
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Resum"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -633,6 +649,9 @@ msgid ""
 "Thick this box if you want that on escalation, the responsible of this sale "
 "team automatically becomes responsible of the lead/opportunity escaladed"
 msgstr ""
+"Marqueu aquesta opció si voleu que el responsable de l'equip de vendes sigui "
+"automàticament responsable de la iniciativa/oportunitat, en cas de ser "
+"escalada."
 
 #. module: crm
 #: help:crm.installer,outlook:0
@@ -641,6 +660,8 @@ msgid ""
 "Allows you to link your e-mail to OpenERP's documents. You can attach it to "
 "any existing one in OpenERP or create a new one."
 msgstr ""
+"Permet enllaçar el seu e-mail a la gestió documental d'OpenERP. Podeu "
+"adjuntar-l'ho a qualsevol document ja existent en OpenERP o crear un de nou."
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -660,12 +681,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Error: L'email no està ben formatat"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -675,7 +696,7 @@ msgstr "Opcions de perfils"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "#Trucades telefòniques"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -698,12 +719,15 @@ msgid ""
 "modes available with the customer. With each commercial opportunity, you can "
 "indicate                         the canall which is this opportunity source."
 msgstr ""
+"Els canals representen les diferents maneres de comunicació possibles amb el "
+"client. En cada oportunitat comercial, podeu indicar el canal que ha estat "
+"l'origen d'aquesta oportunitat."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "La reunió '%s' ha estat confirmada"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -714,7 +738,7 @@ msgstr "Usuari responsable"
 #: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Una empresa ja està definida per a aquesta trucada."
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -722,11 +746,14 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"L'adreça de correu electrònic utilitzada en el \"Respondre a\" de tots els "
+"correus electrònics enviats per OpenERP sobre els casos d'aquest equip de "
+"vendes."
 
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Activitat actual"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -734,11 +761,13 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Defineix una regla o patró de repetició de temps a excloure de la regla "
+"recurrent."
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Horari de treball"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -749,7 +778,7 @@ msgstr "Línies de segmentació d'empresa"
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
@@ -757,11 +786,12 @@ msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
 msgstr ""
+"Li permet sincronitzar les reunions amb altres clients de calendari i mòbils."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Years"
-msgstr ""
+msgstr "Anys"
 
 #. module: crm
 #: help:crm.installer,crm_claim:0
@@ -769,11 +799,13 @@ msgid ""
 "Manages the suppliers and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gestiona les reclamacions de clients i proveïdors, incloent accions "
+"correctives o preventives"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Formulari d'iniciatives"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -784,7 +816,7 @@ msgstr "Segmentació d'empresa"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Ingrés previst"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -800,17 +832,17 @@ msgstr "Probabilitat (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Generació d'iniciatives"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Taulell d'estadístiques"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:88
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:98
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
@@ -821,17 +853,17 @@ msgstr ""
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisió"
 
 #. module: crm
 #: field:crm.installer,crm_caldav:0
 msgid "Calendar Synchronizing"
-msgstr ""
+msgstr "Sincronització del calendari"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -841,14 +873,14 @@ msgstr "Atura procés"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Cerca trucades"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "Continue"
-msgstr ""
+msgstr "Continua"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -858,18 +890,18 @@ msgstr "Dies per període"
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Per dia"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Estableix equip a"
 
 #. module: crm
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Tipus d'esdeveniment"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
@@ -885,12 +917,13 @@ msgstr "Exclusiu"
 #: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "L'oportunitat '%s' ha estat guanyada"
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
 msgstr ""
+"Configureu una alarma en aquest moment, abans que succeeixi l'esdeveniment"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -931,7 +964,7 @@ msgstr ""
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -947,7 +980,7 @@ msgstr "Compra vendes"
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Requisits"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -955,16 +988,19 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Aquesta propietat defineix la llista d'excepcions de data/hora per a un "
+"esdeveniment de calendari recurrent."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Converteix a oportunitat "
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
+"Indiqueu l'ordre de seqüència quan es mostra una llista d'etapes de casos."
 
 #. module: crm
 #: view:crm.lead:0
@@ -973,7 +1009,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunitats"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
@@ -984,22 +1020,22 @@ msgstr "Categoria d'empresa"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Afegeix una nota"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Proveïdor"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
-msgstr ""
+msgstr "\"Respondre a\" de l'equip de vendes definit en aquest cas"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marca com guanyat"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1009,37 +1045,37 @@ msgstr "Import de compra"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Marca com perdut"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "L'oportunitat '%s' ha estat tancada"
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dies per obrir"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Mostra temps com"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:264
 #: view:crm.phonecall2partner:0
 #, python-format
 msgid "Create Partner"
-msgstr ""
+msgstr "Crea empresa"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1050,12 +1086,12 @@ msgstr "<"
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mòbil"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Way to end reccurency"
-msgstr ""
+msgstr "Forma d'acabar recurrència"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:53
@@ -1063,16 +1099,17 @@ msgstr ""
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"No existeixen més oportunitats 'Obertes' o 'Pendents' per a l'empresa '%s'."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Següent etapa"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Les meves reunions"
 
 #. module: crm
 #: field:crm.lead,ref:0
@@ -1082,11 +1119,11 @@ msgstr "Referència"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Accepta rebre emails"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:208
-#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/crm_phonecall.py:185
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
 #: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
@@ -1098,12 +1135,12 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Reunions"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Tria el dia en què repetir la cita"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
@@ -1116,7 +1153,7 @@ msgstr "Següent acció"
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Repeteix fins"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1129,12 +1166,16 @@ 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 camp actiu s'estableix en verdader, s'ometrà l'alarma de "
+"l'esdeveniment, no obstant això no s'eliminarà."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 msgstr ""
+"Les trucades telefòniques tancades/cancel·lades no poden ser convertides en "
+"oportunitats"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1153,51 +1194,51 @@ msgstr "Responsable"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Pèvia"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Estadístiques"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Des de"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Següent"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Etapa:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Guanyat"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Data límit sobrepassada"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Departament de vendes"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "Format HTML?"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -1208,7 +1249,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1228,14 +1269,14 @@ msgstr "Molt baix"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Fitxer adjunt"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1250,12 +1291,12 @@ msgstr "Data creació"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Necessita un disseny de lloc web"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "ID recurrent"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1263,12 +1304,12 @@ msgstr ""
 #: field:crm.send.mail,subject:0
 #: view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "Assumpte"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Dt"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:300
@@ -1279,42 +1320,43 @@ msgstr ""
 #: field:crm.lead.report,stage_id:0
 #, python-format
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Informació històrica"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Mail a l'empresa"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Mailings"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Marca com a"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Repeteix"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
 msgstr ""
+"Permet que l'esdeveniment es repeteixi automàticament en aquest interval"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Camps de condicions de casos"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1326,7 +1368,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Etapes"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1334,7 +1376,7 @@ msgstr ""
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Ingrès esperat"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -1342,13 +1384,15 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Crea categories específiques de trucada telefònica per definir millor el "
+"tipus de trucades en el sistema de seguiment."
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1359,28 +1403,28 @@ msgstr "Màx ID d'empresa processat"
 #: 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 ""
+msgstr "Anàlisi de trucades"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Data d'obertura"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Duració en minuts"
 
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "Gestiona un servei de suport."
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Nom de l'oportunitat"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1388,22 +1432,23 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Si el camp actiu es marca, permet amagar l'equip de vendes sense eliminar-ho."
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: crm
 #: field:crm.meeting,edit_all:0
 msgid "Edit All"
-msgstr ""
+msgstr "Edita tot"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Dv"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -1413,17 +1458,17 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Data d'escriptura"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of recurrency"
-msgstr ""
+msgstr "Finalització de recurrència"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr ""
+msgstr "Recordatori"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1444,7 +1489,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 #: view:res.partner:0
 msgid "Create a Partner"
-msgstr ""
+msgstr "Crea una empresa"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1454,19 +1499,19 @@ msgstr "Estat execució"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Dilluns"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dies per al tancament"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "Desconegut"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1478,7 +1523,7 @@ msgstr "ID"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Empresa a oportunitat"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1497,27 +1542,27 @@ msgstr "Data"
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Resum de l'oportunitat"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Oportunitats per categories"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "Trieu el dia del mes en què es repetirà la reunió"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1537,16 +1582,19 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"Creeu categories d'empresa específiques per gestionar millor les seves "
+"interaccions amb elles. L'eina de segmentació és capaç d'assignar categories "
+"a empreses d'acord als criteris que establiu."
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Codi"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Equips fills"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1559,12 +1607,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Freqüència"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1593,49 +1641,50 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Fusiona les dues oportunitats"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Fix amout of times"
-msgstr ""
+msgstr "Quantitat fixa de vegades"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Regla d'excepció"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
 msgstr ""
+"Verifica això si voleu enviar la norma en un correu electrònic a l'empresa"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Categories de trucades"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Convida persones"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Error! No podeu crear equips de vendes recursius."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Cerca reunions"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1647,6 +1696,8 @@ msgstr "Import de venda"
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
 msgstr ""
+"Impossible enviar el correu electrònic. Verifiqueu que la configuració SMTP "
+"sigui correcta."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1656,7 +1707,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Sense confirmar"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1667,6 +1718,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"L'anàlisi d'oportunitats li dóna accés instantani a les seves oportunitats "
+"amb informació com l'ingrés previst, cost planejat, dates límit incomplides "
+"o el número d'interaccions per oportunitat. Aquest informe l'utilitza "
+"principalment el responsable de vendes per fer una revisió periòdica del "
+"procés de vendes amb els equips."
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1681,7 +1737,7 @@ msgstr "Nom"
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1690,27 +1746,30 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
+"Afegeix etapes específiques d'iniciatives i oportunitats per organitzar "
+"millor el seu flux de vendes. Aquestes etapes permetran un fàcil seguiment "
+"d'iniciatives o oportunitats en relació al cicle de vendes."
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "El/s meu/s cas/os"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Data de naixement"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "El/La"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Assistent"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1718,12 +1777,14 @@ msgid ""
 "Sales team to which this case belongs to. Defines responsible user and e-"
 "mail address for the mail gateway."
 msgstr ""
+"L'equip de vendes al que pertany aquest cas. Definiu l'usuari responsable i "
+"l'adreça de correu electrònic per a la passarel·la de correu."
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Creació"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1736,12 +1797,12 @@ msgstr "Alta"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Converteix el prospecte en empresa"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Converteix"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1750,36 +1811,40 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Amb les invitacions a reunions podeu crear i gestionar les invitacions de "
+"reunions enviades / per ser enviades als seus companys de treball / "
+"empreses. No només podeu convidar els usuaris d'OpenERP, sinó també parts "
+"externes, com un client."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Dissabte"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Cinquè"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "_Schedule"
-msgstr ""
+msgstr "_Calendari"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Temps restant per al tancament"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Dc"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Distribuïdor potencial"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1793,27 +1858,29 @@ msgstr "Retorn previst"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupa per..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
+"Empresa relacionada opcional, normalment després de la conversió de la "
+"iniciativa"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Detalls de la invitació"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Equip pare"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data de la següent acció"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1828,25 +1895,25 @@ msgstr "Hores"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Codi Postal"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:213
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "El cas '%s' ha estat obert"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Entrada"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -1854,27 +1921,29 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Aquest percentatge representa la probabilitat per defecte/ mitjana dels "
+"casos d'aquesta etapa sigui un èxit"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Trucades telefòniques"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication  History"
-msgstr ""
+msgstr "Historial de comunicacions"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Lliure"
 
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Sincronització"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1884,7 +1953,7 @@ msgstr "Permetre eliminar"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Dll"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1902,18 +1971,23 @@ msgid ""
 "with a partner. From the phone call form, you can trigger a request for "
 "another call, a meeting or an opportunity."
 msgstr ""
+"L'eina de trucades entrants li permet seguir el rastre de les seves trucades "
+"entrants en temps real. Cada trucada que rebeu, apareixerà en el formulari "
+"de l'empresa per deixar el rastre de cada contacte que teniu amb una "
+"empresa. Des del formulari de trucada telefònica, podeu llançar una "
+"sol·licitud per a una altra trucada, una reunió o una oportunitat"
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Reunió periòdica"
 
 #. module: crm
 #: view:crm.case.section:0
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -1929,13 +2003,13 @@ msgstr "Valor"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Oportunitats per categories"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Nom del client"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -1949,7 +2023,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Trucada telefònica a oportunitat"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -1959,36 +2033,36 @@ msgstr "Respondre-a"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
-msgstr ""
+msgstr "Seleccioneu les etapes d'aquest equip de vendes"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Oportunitats per etapa"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Opció de recurrencia"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "El prospecte es converteix en una empresa"
 
 #. module: crm
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Converteix a oportunitat"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "Retingut"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2007,12 +2081,12 @@ msgstr "Informació extra"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Fusiona oportunitats"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
@@ -2022,12 +2096,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "Campanya mail 2"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Crea"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2059,27 +2133,27 @@ msgstr "Utilitza les regles de compra vendes"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Iniciativa a Oportunitat"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Ubicació"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Respondre"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Setmanes"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Programeu una reunió normal o telefònica"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -2093,6 +2167,8 @@ msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
 msgstr ""
+"Creeu diferents categories de reunions per organitzar-les i classificar-les "
+"millor."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2103,40 +2179,41 @@ msgstr "Línia de segmentació"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data de planificació"
 
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "URL de caldav"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Ingressos previstos"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "El tipus és utilitzat per separar iniciatives i oportunitats"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
+"Esteu segur que voleu crear una empresa basada en aquesta trucada telefònica?"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2147,23 +2224,29 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"Definiu un equip de vendes per organitzar els diferents venedors o "
+"departaments de vendes en equips separats. Cada equip treballarà amb la seva "
+"pròpia llista d'oportunitats, comanda de venda, etc. Cada usuari pot "
+"configurar un equip predeterminat en les seves preferències d'usuari. Les "
+"oportunitats i comandes de venda mostrades es filtraran automàticament "
+"d'acord al seu equip."
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Repeteix x vegades"
 
 #. 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 ""
+msgstr "Equips de vendes"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Iniciativa a client"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2175,24 +2258,24 @@ msgstr "Segmentació"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Equip"
 
 #. module: crm
 #: field:crm.installer,outlook:0
 msgid "MS-Outlook"
-msgstr ""
+msgstr "MS-Outlook"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 #: view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "No ocupat"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Probabilitat"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2201,7 +2284,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2209,7 +2292,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Iniciatives"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2224,45 +2307,58 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"Les iniciatives li permeten gestionar i realitzar un seguiment de tots els "
+"contactes inicials amb un client potencial o soci que mostri interès en els "
+"seus productes o serveis. Una iniciativa és, generalment, el primer pas en "
+"el seu cicle de vendes. Una vegada identificada, una iniciativa es pot "
+"convertir en una oportunitat de negoci, creant-se l'empresa corresponent per "
+"al seguiment detallat de qualsevol activitat relacionada. Podeu importar una "
+"base de dades de possibles clients, realitzar el seguiment de les seves "
+"targetes de visita o integrar el formulari de contacte del seu lloc web amb "
+"les iniciatives d'OpenERP. Les iniciatives poden ser connectades a una "
+"passarel·la de correu electrònic: els nous correus crearan noves iniciatives "
+"i cadascuna d'elles obtindrà automàticament l'historial de la conversa amb "
+"el client potencial."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Crea una nova empresa"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Todo"
-msgstr ""
+msgstr "Pendents"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegat"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Rebutja"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Si opt-in està marcat, aquest contacte ha acceptat rebre correus electrònics."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Restableix a no confirmat"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:40
@@ -2275,6 +2371,8 @@ msgstr "Nota"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La companyia seleccionada no està en les companyies permeses per aquest "
+"usuari"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2301,12 +2399,12 @@ msgstr "Tancat"
 #. module: crm
 #: view:crm.installer:0
 msgid "Plug-In"
-msgstr ""
+msgstr "Connector"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Reunió interna"
 
 #. module: crm
 #: code:addons/crm/crm.py:411
@@ -2326,13 +2424,13 @@ msgstr "Pendent"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Reunió de client"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2340,19 +2438,19 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: view:res.partner:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "Trucades de telèfon"
 
 #. 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 ""
+msgstr "Número de dies per obrir el cas"
 
 #. module: crm
 #: field:crm.lead,phone:0
 #: field:crm.phonecall,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telèfon"
 
 #. module: crm
 #: field:crm.case.section,active:0
@@ -2367,7 +2465,7 @@ msgstr "Actiu"
 #: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "La fase de l'oportunitat '%s' ha canviat a '%s'."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:282
@@ -2388,18 +2486,18 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Incert"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Envia correu"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -2412,11 +2510,15 @@ msgid ""
 "Helps you manage wiki pages for Frequently Asked Questions on Sales "
 "Application."
 msgstr ""
+"Li ajuda a organitzar pàgines wiki per a preguntes freqüents sobre "
+"l'aplicació de vendes"
 
 #. module: crm
 #: help:crm.installer,crm_fundraising:0
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
+"Podeu ajudar a les associacions en el seu procés d'obtenció de fons i "
+"seguiment."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2428,7 +2530,7 @@ msgstr "Acció"
 #. module: crm
 #: field:crm.installer,crm_claim:0
 msgid "Claims"
-msgstr ""
+msgstr "Reclamacions"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2440,12 +2542,12 @@ msgstr "Disminueix (0>1)"
 #: view:crm.lead:0
 #: view:crm.send.mail:0
 msgid "Attachments"
-msgstr ""
+msgstr "Fitxers adjunts"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Setmanal"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:72
@@ -2453,30 +2555,30 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "No s'ha pogut enviar el correu!"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "Varis"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "Altres"
 
 #. module: crm
 #: view:crm.meeting:0
 #: selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0
 msgid "Done"
-msgstr ""
+msgstr "Fet"
 
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Repeteix cada (dies/setmana/mes/any)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2486,7 +2588,7 @@ msgstr "Interval màx"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "_Schedule Call"
-msgstr ""
+msgstr "_Programa trucada"
 
 #. module: crm
 #: code:addons/crm/crm.py:326
@@ -2506,59 +2608,59 @@ msgstr "Obert"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Dimarts"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Ciutat"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Ocupat"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Repeteix cada"
 
 #. module: crm
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Asistència/Ajuda"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Recurrent"
 
 #. module: crm
 #: code:addons/crm/crm.py:397
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "El cas '%s' ha estat cancel·lat"
 
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr ""
+msgstr "Oportunitat a pressupost"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
 msgid "Send new email"
-msgstr ""
+msgstr "Envia nou email"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Les meves oportunitats obertes"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM - Taulell d'estadístiques"
 
 #. module: crm
 #: help:crm.meeting,rrule:0
@@ -2567,11 +2669,14 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Definiu una regla o patró repetitiu per esdeveniments recurrents.\n"
+"Per exemple: Per 10 ocurrències cada últim diumenge de cada dos mesos : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Treball principal"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2583,18 +2688,19 @@ msgstr "Màxim historial de comunicacions"
 #: view:crm.lead2partner:0
 msgid "Are you sure you want to create a partner based on this lead ?"
 msgstr ""
+"Esteu segurs que voleu crear una empresa basada en aquesta iniciativa?"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Tipus de reunió"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:314
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr ""
+msgstr "Fusionar amb oportunitat existent"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2608,17 +2714,24 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"L'estat s'estableix a 'Esborrany', quan es crea un cas.                      "
+"            \n"
+"Si el cas està en progrés l'estat s'estableix a 'Obert'.                     "
+"             \n"
+"Quan el cas es tanca, l'estat s'estableix a 'Realitzat'.                     "
+"             \n"
+"Si el cas necessita ser revisat llavors en estat s'estableix a 'Pendent'."
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Data final"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tercer"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2632,54 +2745,54 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "My Win/Lost Ratio for the Last Year"
-msgstr ""
+msgstr "El meu coeficient guanyat/perdut de l'any anterior"
 
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "Nº d'e-mails"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Cerca iniciatives"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Retard d'obertura"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Període de recurrència"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Dia laborable"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Referent"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr ""
+msgstr "Iniciativa a oportunitat"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Informació assistència"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2694,12 +2807,12 @@ msgstr "Continua el procés"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Configureu la seva aplicació CRM"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Trucada telefònica a empresa"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -2707,18 +2820,19 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "into opportunity"
 msgstr ""
+"El nom del futur client que es crearà quan es converteixi en oportunitat."
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Assigna a"
 
 #. module: crm
 #: field:crm.add.note,state:0
 #: field:crm.send.mail,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Estableix nou estat a"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2732,65 +2846,65 @@ msgstr "Última acció"
 #: field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durada"
 
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
-msgstr ""
+msgstr "Respondre a"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Taulell de vendes"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:56
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Una empresa ja està definida en aquesta inicitiva."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# de casos"
 
 #. module: crm
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Equip de vendes al qual pertany el cas"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Diumenge"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Quart"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 #: selection:crm.merge.opportunity,state:0
 #: selection:crm.send.mail,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Sense canvis"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Segmentació d'empreses"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2807,11 +2921,19 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"Amb les oportunitats podeu gestionar i guardar el registre del seu canal de "
+"vendes creant documents específics de venda per client - o potencial client -"
+" per al seguiment de les seves vendes potencials. La informació sobre "
+"ingressos previstos, etapa de l'oportunitat, data prevista de tancament, "
+"històric de les comunicacions i moltes altres dades poden ser registrades. "
+"Les oportunitats poden ser connectades a la passarel·la de correu "
+"electrònic: nous emails poden crear oportunitats, i cadascun d'ells obté "
+"automàticament l'historial de la conversa amb el client."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Assignació"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2821,17 +2943,17 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Companyia"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Divendres"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Tot el dia"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -2842,51 +2964,51 @@ msgstr "Obligatori / Opcional"
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "Invitacions a reunió"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Nom de l'objecte"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "e-mail del contacte"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Referenciat per"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Afegeix nota interna"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:304
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "L'etapa de la iniciativa '%s' ha estat canviada per '%s'"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Darrer"
 
 #. module: crm
 #: field:crm.lead,message_ids:0
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Missatges"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "Canvia probabilitat per a les següents i anteriors etapes."
 
 #. module: crm
 #: code:addons/crm/crm.py:455
@@ -2901,7 +3023,7 @@ msgstr "Error!"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Resum de la trucada"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2913,34 +3035,34 @@ msgstr ""
 #: selection:crm.phonecall.report,state:0
 #: selection:crm.send.mail,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancel·lat"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Contingut de la nota"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Els meus ingressos previstos per etapa"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data de tancament"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Enllaços"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2950,6 +3072,11 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Crea categories específiques que s'adaptin a les activitats de la seva "
+"companyia per classificar i analitzar millor les seves iniciatives i "
+"oportunitats. Aquestes categories podrien, per exemple, reflectir "
+"l'estructura dels seus productes o dels diferents tipus de vendes que "
+"realitzeu."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2968,33 +3095,37 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Des d'aquest informe, podeu analitzar el rendiment del seu equip de vendes "
+"basant-se en les trucades telefòniques. Podeu agrupar o filtrar la "
+"informació d'acord a diversos criteris i aprofundir en la informació afegint "
+"més grups a l'informe."
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mailgateway"
-msgstr ""
+msgstr "Passarel·la de correu"
 
 #. module: crm
 #: help:crm.lead,user_id:0
 msgid "By Default Salesman is Administrator when create New User"
-msgstr ""
+msgstr "Per defecte el venedor és administrador quan es crea un nou usuari"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "nº de mails"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Atenció"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 #: view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Resum de trucades"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3004,22 +3135,22 @@ msgstr "Operador"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Trucada telefònica a trucada telefònica"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Planifica/Registra trucada"
 
 #. module: crm
 #: field:crm.installer,fetchmail:0
 msgid "Fetch Emails"
-msgstr ""
+msgstr "Cerca emails"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmat"
 
 #. module: crm
 #: help:crm.send.mail,email_cc:0
@@ -3027,16 +3158,18 @@ msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
 "CC list, edit the global CC field of this case"
 msgstr ""
+"Aquestes adreces rebran una còpia d'aquest correu electrònic. Per modificar "
+"la llista CC permanent, editeu el camp CC global d'aquest cas."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirma"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Dg"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -3046,7 +3179,7 @@ msgstr "Secció"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Total ingressos previstos"
 
 #. module: crm
 #: code:addons/crm/crm.py:375
@@ -3055,6 +3188,8 @@ msgid ""
 "You can not escalate, You are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"No podeu escalar, ja està en el nivell més alt en la seva categoria d'equip "
+"de vendes."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3064,23 +3199,23 @@ msgstr "Expressió opcional"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dia del mes"
 
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Taxa d'èxit (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 #: model:crm.case.stage,name:crm.stage_opportunity1
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Envia correu a"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3102,14 +3237,16 @@ msgstr "Canal"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule Call"
-msgstr ""
+msgstr "Planifica trucada"
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:135
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:260
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
+"Les iniciatives tancades/cancel·lades no poden ser convertides en "
+"oportunitats"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3124,16 +3261,20 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Marqueu aquesta opció si la categoria està limitada a empreses que "
+"coincideixin amb els criteris de segmentació.\n"
+"Si està marcada, elimina la categoria d'aquelles empreses que no "
+"coincideixin amb els criteris de segmentació."
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Data/hores d'excepció"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Confidential"
-msgstr ""
+msgstr "Confidencial"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
@@ -3141,42 +3282,43 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
+"La data límit es calcula automàticament a partir de la data inicial + durada."
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Província"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Creant oportunitats de negoci des d'iniciatives"
 
 #. module: crm
 #: help:crm.send.mail,html:0
 msgid "Select this if you want to send email with HTML formatting."
-msgstr ""
+msgstr "Seleccioneu aquesta opció si desitgeu enviar emails amb format HTML"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Necessita informació"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Oportunitat de prospecció"
 
 #. module: crm
 #: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
-msgstr ""
+msgstr "Configuració de l'aplicació CRM"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Estableix categoria"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3186,7 +3328,7 @@ msgstr "Configuració"
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Dj."
 
 #. module: crm
 #: view:crm.add.note:0
@@ -3197,51 +3339,51 @@ msgstr ""
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr ""
+msgstr "Aquest mòdul relaciona vendes amb oportunitats en el CRM."
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Diari"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 #: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
-msgstr ""
+msgstr "Qualificació"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Definició d'etapa"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Primer"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3259,28 +3401,35 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"Un període és el número mitjà de dies entre dos cicles de venda o compra "
+"d'aquesta segmentació.                 \n"
+"S'utilitza principalment per detectar si una empresa no ha comprat en un "
+"llarg període de temps,                 \n"
+"per la qual cosa suposem que el seu grau de satisfacció ha disminuït perquè "
+"segurament va comprar béns a un altre proveïdor.                 \n"
+"Utilitzeu aquesta funcionalitat per a negocis recurrents."
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send Reply"
-msgstr ""
+msgstr "_Envia resposta"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Zona horària"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,msg:0
 #: field:crm.lead2partner,msg:0
 #: view:crm.send.mail:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Ds."
 
 #. module: crm
 #: view:crm.lead:0
@@ -3288,17 +3437,17 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venedor"
 
 #. module: crm
 #: field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Tancament previst"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Oportunitat a trucada telefònica"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3308,31 +3457,31 @@ msgstr "Permet eliminar els casos en estat no esborrany."
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Programa reunió"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Nom d'empresa"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Sortida"
 
 #. module: crm
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Obert"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Membres de l'equip"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3341,17 +3490,17 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactes"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interessat en ordinadors"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Detall de la invitació"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3365,17 +3514,20 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Aquestes adreces de correu seran afegides al camp CC per a tots els correus "
+"entrants i sortints d'aquest registre abans de ser enviats. Separeu les "
+"diferents adreces de correu amb una coma."
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Probabilitat d'èxit"
 
 #. module: crm
 #: code:addons/crm/crm.py:426
@@ -3393,12 +3545,12 @@ msgstr "Esborrany"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Casos per equip de vendes"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Assistents"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3407,38 +3559,38 @@ msgstr ""
 #: model:process.node,name:crm.process_node_meeting0
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "Reunió"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Categoria de cas"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 dies"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Ingressos previstos per etapa i usuari"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicació i historial"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Report"
-msgstr ""
+msgstr "Informe d'iniciatives CRM"
 
 #. module: crm
 #: field:crm.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -3451,38 +3603,38 @@ msgstr "Normal"
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Carrer2"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Categories de reunions"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Verifiqueu que aquesta empresa ja no existeix."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Retard d'obertura"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuari/a"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:67
@@ -3493,19 +3645,19 @@ msgstr "No s'ha trobat Email en l'adreça de la seva companyia!"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Oportunitats per etapa"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Planifica trucada telefònica"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
@@ -3515,16 +3667,20 @@ msgid ""
 "them to easily track how is positioned a specific opportunity in the sales "
 "cycle."
 msgstr ""
+"Crear passos específics que ajudaran al seu departament de vendes a "
+"organitzar millor el flux de venda gestionant les seves oportunitats de "
+"venda. Això els permetrà seguir fàcilment com està posicionada una "
+"oportunitat en el cicle de vendes."
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Contracte"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Anuncis Twiter"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:26
@@ -3533,28 +3689,28 @@ msgstr ""
 #: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Ingressos esperats"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Necessita consultoria"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Error! No es pot crear perfils recursius."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:232
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "El cas '%s' ha estat tancat"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0
@@ -3566,18 +3722,18 @@ msgstr "Contacte empresa"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "ID data recurrent"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "No podeu tenir dos usuaris amb el mateix identificador d'usuari!"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr ""
+msgstr "Fusionat amb l'oportunitat '%s'"
 
 #. module: crm
 #: code:addons/crm/crm.py:347
@@ -3592,48 +3748,48 @@ msgstr "Tanca"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Categorization"
-msgstr ""
+msgstr "Categorizació"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Regles d'accions"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recurrència"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Trucada telefònica"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Dijous"
 
 #. module: crm
 #: view:crm.meeting:0
 #: field:crm.send.mail,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Fins"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Funció"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Afegeix"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -3669,79 +3825,79 @@ msgstr "Descripció"
 #: field:res.partner,section_id:0
 #: field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equip de vendes"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Interessat en accessoris"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "L'oportunitat '%s' ha estat oberta"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Nº d'emails"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Adreça"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Oportunitats per usuari i equip"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Hores de treball"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 #: view:res.partner:0
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Planifica una reunió"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 #: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
 #. module: crm
 #: field:crm.lead,country_id:0
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3749,50 +3905,50 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Converteix a oportunitat"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Dimecres"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Nom de la campanya"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Trucades telefòniques per usuari i secció"
 
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Fusionat amb oportunitat existent"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Opcions"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 #: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
-msgstr ""
+msgstr "Negociació"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Tancament previst"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0
@@ -3803,12 +3959,12 @@ msgstr "Seqüència"
 #. module: crm
 #: field:crm.send.mail,body:0
 msgid "Message Body"
-msgstr ""
+msgstr "Cos del missatge"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepta"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3818,18 +3974,18 @@ msgstr "Control variable"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Segons"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 #: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
-msgstr ""
+msgstr "Proposta"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Trucades telefòniques"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3837,12 +3993,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Butlletí de notícies"
 
 #, python-format
 #~ msgid ""
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 99791b5f213..9f2db54a4c9 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-11 21:28+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-07-30 14:12+0000\n"
+"Last-Translator: DReis \n"
 "Language-Team: Portuguese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:41+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-31 04:38+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -54,13 +54,13 @@ msgstr ""
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi-Companies"
-msgstr ""
+msgstr "Multi-empresas"
 
 #. module: multi_company
 #: model:ir.module.module,shortdesc:multi_company.module_meta_information
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi-empresa"
 
 #. module: multi_company
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
@@ -76,12 +76,12 @@ msgstr ""
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Matching"
-msgstr ""
+msgstr "Correspondente"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Condição"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 7c7e1766eef..10d13529fd8 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-07 20:56+0000\n"
+"PO-Revision-Date: 2011-07-31 06:20+0000\n"
 "Last-Translator: Phong Nguyen-Thanh \n"
 "Language-Team: Vietnamese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-23 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-08-01 04:39+0000\n"
 "X-Generator: Launchpad (build 13405)\n"
 
 #. module: purchase
@@ -493,7 +493,7 @@ msgstr "Giá trung bình"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr "Tổng số:"
+msgstr "Tổng :"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
diff --git a/addons/survey/i18n/pt.po b/addons/survey/i18n/pt.po
index ffe2e9d2e68..8004ce0961e 100644
--- a/addons/survey/i18n/pt.po
+++ b/addons/survey/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-19 17:10+0000\n"
-"Last-Translator: Tiago Baptista \n"
+"PO-Revision-Date: 2011-07-30 14:30+0000\n"
+"Last-Translator: DReis \n"
 "Language-Team: Portuguese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-03 04:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-07-31 04:38+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -53,6 +53,8 @@ msgid ""
 "your maximum is greater than the number of answer.                           "
 "           Please use a number that is smaller than %d."
 msgstr ""
+"O número máximo de respostas que indicou é maior que o número total de "
+"perguntas. Por favor introduza um número menor que %d."
 
 #. module: survey
 #: view:survey:0
@@ -332,7 +334,7 @@ msgstr "Cancelado"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Rating Scale"
-msgstr ""
+msgstr "Escala de pontuação"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
@@ -362,24 +364,24 @@ msgstr ""
 #: code:addons/survey/survey.py:642
 #: code:addons/survey/wizard/survey_answer.py:124
 #: code:addons/survey/wizard/survey_answer.py:131
-#: code:addons/survey/wizard/survey_answer.py:699
-#: code:addons/survey/wizard/survey_answer.py:738
-#: code:addons/survey/wizard/survey_answer.py:758
-#: code:addons/survey/wizard/survey_answer.py:787
-#: code:addons/survey/wizard/survey_answer.py:792
-#: code:addons/survey/wizard/survey_answer.py:800
-#: code:addons/survey/wizard/survey_answer.py:811
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:825
-#: code:addons/survey/wizard/survey_answer.py:899
-#: code:addons/survey/wizard/survey_answer.py:935
-#: code:addons/survey/wizard/survey_answer.py:953
-#: code:addons/survey/wizard/survey_answer.py:981
-#: code:addons/survey/wizard/survey_answer.py:984
-#: code:addons/survey/wizard/survey_answer.py:987
-#: code:addons/survey/wizard/survey_answer.py:999
-#: code:addons/survey/wizard/survey_answer.py:1006
-#: code:addons/survey/wizard/survey_answer.py:1009
+#: code:addons/survey/wizard/survey_answer.py:700
+#: code:addons/survey/wizard/survey_answer.py:739
+#: code:addons/survey/wizard/survey_answer.py:759
+#: code:addons/survey/wizard/survey_answer.py:788
+#: code:addons/survey/wizard/survey_answer.py:793
+#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:812
+#: code:addons/survey/wizard/survey_answer.py:821
+#: code:addons/survey/wizard/survey_answer.py:826
+#: code:addons/survey/wizard/survey_answer.py:900
+#: code:addons/survey/wizard/survey_answer.py:936
+#: code:addons/survey/wizard/survey_answer.py:954
+#: code:addons/survey/wizard/survey_answer.py:982
+#: code:addons/survey/wizard/survey_answer.py:985
+#: code:addons/survey/wizard/survey_answer.py:988
+#: code:addons/survey/wizard/survey_answer.py:1000
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1010
 #: code:addons/survey/wizard/survey_selection.py:134
 #: code:addons/survey/wizard/survey_selection.py:138
 #: code:addons/survey/wizard/survey_send_invitation.py:74
@@ -467,7 +469,7 @@ msgstr "Assunto"
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "Número decimal máximo"
 
 #. module: survey
 #: view:survey.request:0
@@ -728,8 +730,8 @@ msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:758
-#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:759
+#: code:addons/survey/wizard/survey_answer.py:954
 #, python-format
 msgid "Please enter an integer value"
 msgstr "Por favor, indique um número inteiro"
@@ -835,7 +837,7 @@ msgstr "Nº. Resposta"
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Imprimir sem quebras de página"
 
 #. module: survey
 #: view:survey:0
@@ -1340,7 +1342,7 @@ msgstr ""
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
-msgstr ""
+msgstr "Indicar um se o inquerito só puder ser respondido uma vez"
 
 #. module: survey
 #: selection:survey.response,state:0
@@ -1370,12 +1372,12 @@ msgstr ""
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: survey
 #: view:survey:0
 msgid "Current"
-msgstr ""
+msgstr "Atual"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1383,7 +1385,7 @@ msgid "Answered"
 msgstr "Respondido"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:432
+#: code:addons/survey/wizard/survey_answer.py:433
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1410,7 +1412,7 @@ msgid "Send Invitation"
 msgstr "Enviar Convite"
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:793
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1447,7 +1449,7 @@ msgstr "Selecionar inquérito"
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Least"
-msgstr ""
+msgstr "No mínimo"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
@@ -1514,7 +1516,7 @@ msgstr "Respostas aos inquéritos"
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "Páginas"
 
 #. module: survey
 #: code:addons/survey/survey.py:406
@@ -1526,7 +1528,7 @@ msgid ""
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:985
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""
@@ -1535,12 +1537,12 @@ msgstr ""
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Copy text \t Legal (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: survey
 #: view:survey.page:0
@@ -1558,7 +1560,7 @@ msgstr "survey.response"
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "Mensagem de erro"
 
 #. module: survey
 #: model:ir.module.module,shortdesc:survey.module_meta_information
@@ -1645,7 +1647,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Float"
-msgstr ""
+msgstr "Float"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -1661,12 +1663,12 @@ msgstr "O inquérito %s não está aberto"
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Peso"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "Data e hora"
 
 #. module: survey
 #: field:survey.response,date_create:0
@@ -1677,7 +1679,7 @@ msgstr "Data Criada"
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Nome de coluna"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1696,7 +1698,7 @@ msgstr ""
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "Tabela"
 
 #. module: survey
 #: code:addons/survey/survey.py:642
diff --git a/addons/web_livechat/i18n/pt.po b/addons/web_livechat/i18n/pt.po
new file mode 100644
index 00000000000..3e4e5c9dd00
--- /dev/null
+++ b/addons/web_livechat/i18n/pt.po
@@ -0,0 +1,41 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-07-31 22:18+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-01 04:39+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid ""
+"Your publisher warranty contract is already subscribed in the system !"
+msgstr ""
+
+#. module: web_livechat
+#: model:ir.module.module,shortdesc:web_livechat.module_meta_information
+msgid "Live Chat Support"
+msgstr "Suporte por mensagens instantâneas (chat)"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "Copy text \t publisher_warranty.contract"
+
+#. module: web_livechat
+#: model:ir.module.module,description:web_livechat.module_meta_information
+msgid "Enable live chat support for whom have a maintenance contract"
+msgstr ""
+"Ativar suporte através de mensagens instantâneas para quem tenha contrato de "
+"suporte"

From b159aab4464fc7d73ca18fab6047216b0c560fec Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:11:07 +0200
Subject: [PATCH 129/167] [IMP] simplify unpacking of parameters in db
 operations, cleanup error handling as well

bzr revid: xmo@openerp.com-20110801091107-cw5rx59s2kgbgo51
---
 addons/base/controllers/main.py | 88 ++++++++++++---------------------
 1 file changed, 31 insertions(+), 57 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 8fe79a19a9a..14a0a352079 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -4,6 +4,7 @@ import base64, glob, os, re
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
+import operator
 import simplejson
 
 import openerpweb
@@ -164,54 +165,37 @@ class Database(openerpweb.Controller):
     
     @openerpweb.jsonrequest
     def create_db(self, req, fields):
-        
-        for field in fields:
-            if field['name'] == 'super_admin_pwd':
-                super_admin_pwd = field['value']
-            elif field['name'] == 'db_name':
-                dbname = field['value']
-            elif field['name'] == 'demo_data':
-                demo_data = field['value']
-            elif field['name'] == 'db_lang':
-                db_lang = field['value']
-            elif field['name'] == 'create_admin_pwd':
-                admin_pwd = field['value']
-                
-        if dbname and not re.match('^[a-zA-Z][a-zA-Z0-9_]+$', dbname):
-            return {'error': "You must avoid all accents, space or special characters.", 'title': 'Bad database name'}
-        
-        ok = False
+
+        params = dict(map(operator.itemgetter('name', 'value'), fields))
+        create_attrs = operator.itemgetter(
+            'super_admin_pwd', 'db_name', 'demo_data', 'db_lang', 'create_admin_pwd')(
+            params)
+
         try:
-            return req.session.proxy("db").create(super_admin_pwd, dbname, demo_data, db_lang, admin_pwd)
-        except Exception, e:
+            return req.session.proxy("db").create(*create_attrs)
+        except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Create Database'}
-            else:
-                return {'error': 'Could not create database !', 'title': 'Create Database'}
+        return {'error': 'Could not create database !', 'title': 'Create Database'}
 
     @openerpweb.jsonrequest
     def drop_db(self, req, fields):
-        for field in fields:
-            if field['name'] == 'drop_db':
-                db = field['value']
-            elif field['name'] == 'drop_pwd':
-                password = field['value']
+        password, db = operator.itemgetter(
+            'drop_pwd', 'drop_db')(
+                dict(map(operator.itemgetter('name', 'value'), fields)))
         
         try:
             return req.session.proxy("db").drop(password, db)
-        except Exception, e:
+        except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Drop Database'}
-            else:
-                return {'error': 'Could not drop database !', 'title': 'Drop Database'}
+        return {'error': 'Could not drop database !', 'title': 'Drop Database'}
 
     @openerpweb.jsonrequest
     def backup_db(self, req, fields):
-        for field in fields:
-            if field['name'] == 'backup_db':
-                db = field['value']
-            elif field['name'] == 'backup_pwd':
-                password = field['value']
+        password, db = operator.itemgetter(
+            'backup_pwd', 'backup_db')(
+                dict(map(operator.itemgetter('name', 'value'), fields)))
 
         try:
             res = req.session.proxy("db").dump(password, db)
@@ -219,46 +203,36 @@ class Database(openerpweb.Controller):
                 cherrypy.response.headers['Content-Type'] = "application/data"
                 cherrypy.response.headers['Content-Disposition'] = 'filename="' + db + '.dump"'
                 return base64.decodestring(res)
-        except Exception, e:
+        except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Backup Database'}
-            else:
-                return {'error': 'Could not drop database !', 'title': 'Backup Database'}
+        return {'error': 'Could not drop database !', 'title': 'Backup Database'}
             
     @openerpweb.jsonrequest
     def restore_db(self, req, fields):
-        for field in fields:
-            if field['name'] == 'restore_db':
-                filename = field['value']
-            elif field['name'] == 'new_db':
-                db = field['value']
-            elif field['name'] == 'restore_pwd':
-                password = field['value']
-        
+        password, db, filename = operator.itemgetter(
+            'restore_pwd', 'new_db', 'value')(
+                dict(map(operator.itemgetter('name', 'value'), fields)))
+
         try:
             data = base64.encodestring(filename.file.read())
             return req.session.proxy("db").restore(password, db, data)
-        except Exception, e:
+        except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Restore Database'}
-            else:
-                return {'error': 'Could not restore database !', 'title': 'Restore Database'}
+        return {'error': 'Could not restore database !', 'title': 'Restore Database'}
         
     @openerpweb.jsonrequest
     def change_password_db(self, req, fields):
-        for field in fields:
-            if field['name'] == 'old_pwd':
-                old_password = field['value']
-            elif field['name'] == 'new_pwd':
-                new_password = field['value']
-        
+        old_password, new_password = operator.itemgetter(
+            'old_pwd', 'value')(
+                dict(map(operator.itemgetter('name', 'value'), fields)))
         try:
             return req.session.proxy("db").change_admin_password(old_password, new_password)
-        except Exception, e:
+        except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Change Password'}
-            else:
-                return {'error': 'Error, password not changed !', 'title': 'Change Password'}
+        return {'error': 'Error, password not changed !', 'title': 'Change Password'}
 
 class Session(openerpweb.Controller):
     _cp_path = "/base/session"

From 74756c3e24862bfd122a8419e2c6e43955a1fd17 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:16:36 +0200
Subject: [PATCH 130/167] [IMP] remove useless conditional in db controller
 init, don't go select the exact same element twice in a row

bzr revid: xmo@openerp.com-20110801091636-8yijuv1rf71zyq0e
---
 addons/base/static/src/js/chrome.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 63226a2f9b9..40c64ed13fc 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -674,15 +674,12 @@ openerp.base.Database = openerp.base.Controller.extend({
         this._super(parent, element_id);
         this.option_id = option_id;
         this.$option_id = $('#' + option_id);
-        
-        if(this.parent && this.parent.session) {
-            this.session = this.parent.session;
-        }
     },
     start: function() {
         this.$element.html(QWeb.render("Database", this));
-        this.$element.closest(".openerp").removeClass("login-mode");
-        this.$element.closest(".openerp").addClass("database_block");
+        this.$element.closest(".openerp")
+                .removeClass("login-mode")
+                .addClass("database_block");
         
         var self = this;
         

From ba16957d33d78294fba87df239ae41a384141d9d Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:17:33 +0200
Subject: [PATCH 131/167] [IMP] db RPC calls: don't generate unused unique IDs
 when displaying errors, remove references to removed variables, var an
 implicit global

bzr revid: xmo@openerp.com-20110801091733-lz7otl6e5nzjr51q
---
 addons/base/static/src/js/chrome.js | 68 +++++++++++++----------------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 40c64ed13fc..1eb963bd9d7 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -735,14 +735,12 @@ openerp.base.Database = openerp.base.Controller.extend({
        	    ev.preventDefault();
        	
        	    var fields = $(this).serializeArray();
-                
             self.rpc("/base/database/create_db", {'fields': fields},
             function(result) {
                 if (result && !result.error) {
-                
+
                 } else if(result.error) {
-                   var db_error_dialog = _.uniqueId("db_error_dialog");
-                        $('
      ', {id: db_error_dialog}).dialog({
+                    $('
      ').dialog({
                         modal: true,
                         title: result.title,
                         buttons: {
@@ -766,28 +764,26 @@ openerp.base.Database = openerp.base.Controller.extend({
        	    ev.preventDefault();
        	
 	        var fields = $(this).serializeArray();
-	        db = $('select[name=drop_db] :selected').val();
+	        var db = $('select[name=drop_db] :selected').val();
 	        
 	        if (confirm("Do you really want to delete the database: " + db + " ?")) {
-	        self.rpc("/base/database/drop_db", {'fields': fields}, 
-	            function(result) {
-	                    if (result && ! result.error) {
-	                        self.$option_id.find("select[name=drop_db] :selected").remove();
-	                        self.notification.notify("Dropping database", "The database '" + db + "' has been dropped");
-	                    } else if(result.error) {
-	                        var db_error_dialog = _.uniqueId("db_error_dialog");
-	                        $('
      ', {id: db_error_dialog}).dialog({
-	                            modal: true,
-	                            title: result.title,
-	                            buttons: {
-	                                Ok: function() {
-	                                    $(this).dialog("close");
-	                                }
-	                            }
-	                        }).html(result.error);
-	                    }
-	               });
-	            }
+	            self.rpc("/base/database/drop_db", {'fields': fields}, function(result) {
+                    if (result && ! result.error) {
+                        self.$option_id.find("select[name=drop_db] :selected").remove();
+                        self.notification.notify("Dropping database", "The database '" + db + "' has been dropped");
+                    } else if(result.error) {
+                        $('
      ').dialog({
+                            modal: true,
+                            title: result.title,
+                            buttons: {
+                                Ok: function() {
+                                    $(this).dialog("close");
+                                }
+                            }
+                        }).html(result.error);
+                    }
+                });
+            }
         });
     },
     
@@ -802,14 +798,12 @@ openerp.base.Database = openerp.base.Controller.extend({
        	
             var fields = $(this).serializeArray();
             
-            self.rpc("/base/database/backup_db", {'fields': fields}, 
-            function(result) {
+            self.rpc("/base/database/backup_db", {'fields': fields}, function(result) {
                 if (result && !result.error) {
-                    self.notification.notify("Backup Database", "Backup has been created for the database: '" + db + "'");
-                   } else if(result.error) {
-                    var db_error_dialog = _.uniqueId("db_error_dialog");
-                        $('
      ', {id: db_error_dialog}).dialog({
-                    modal: true,
+                    self.notification.notify("Backup Database", "Backup has been created for the database");
+                } else if(result.error) {
+                    $('
      ').dialog({
+                        modal: true,
                         title: result.title,
                         buttons: {
                             Ok: function() {
@@ -836,10 +830,9 @@ openerp.base.Database = openerp.base.Controller.extend({
             self.rpc("/base/database/restore_db", {'fields': fields}, 
             function(result) {
                 if (result && !result.error) {
-                   self.notification.notify("Restore Database", "You restored your database as: '" + new_db + "'");
+                   self.notification.notify("Restore Database", "You restored your database");
                 } else if(result.error) {
-                    var db_error_dialog = _.uniqueId("db_error_dialog");
-                        $('
      ', {id: db_error_dialog}).dialog({
+                    $('
      ').dialog({
                         modal: true,
                         title: result.title,
                         buttons: {
@@ -889,9 +882,8 @@ openerp.base.Database = openerp.base.Controller.extend({
                function(result) {
                    if (result && !result.error) {
                       self.notification.notify("Changed Password", "Password has been changed successfully");
-                  } else if(result.error) {
-                      var db_error_dialog = _.uniqueId("db_error_dialog");
-                   	    $('
      ', {id: db_error_dialog}).dialog({
+                   } else if(result.error) {
+                        $('
      ').dialog({
                             modal: true,
                             title: result.title,
                             buttons: {
@@ -900,7 +892,7 @@ openerp.base.Database = openerp.base.Controller.extend({
                                 }
                             }
                         }).html(result.error);
-                  }
+                   }
                });
            	});
     }

From aeaf9897d5d10a6cb34ef7dccbca41c3391800e4 Mon Sep 17 00:00:00 2001
From: niv-openerp 
Date: Mon, 1 Aug 2011 11:18:25 +0200
Subject: [PATCH 132/167] [imp] corrected some doc

bzr revid: nicolas.vanhoren@openerp.com-20110801091825-ge0ha30u9v5707zb
---
 addons/base/static/src/js/core.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 790542be7e4..7623ec8d263 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -357,7 +357,7 @@ openerp.base.SessionAware = openerp.base.Class.extend({
  * 
  * Widget also extends SessionAware for ease of use.
  * 
- * Guide to create implementations of this class:
+ * Guide to create implementations of the Widget class:
  * ==============================================
  * 
  * Here is a sample child class:
@@ -365,7 +365,7 @@ openerp.base.SessionAware = openerp.base.Class.extend({
  * MyWidget = openerp.base.Widget.extend({
  *     // the name of the QWeb template to use for rendering
  *     template: "MyQWebTemplate",
- *     // identifier prefix, useful to put an obvious one for debugging
+ *     // identifier prefix, it is useful to put an obvious one for debugging
  *     identifier_prefix: 'my-id-prefix-',
  * 
  *     init: function(parent) {
@@ -373,7 +373,8 @@ openerp.base.SessionAware = openerp.base.Class.extend({
  *         // stuff that you want to init before the rendering
  *     },
  *     start: function() {
- *         // stuff you want to make after the rendering, `this.$element` holds a value
+ *         this._super();
+ *         // stuff you want to make after the rendering, `this.$element` holds a correct value
  *         this.$element.find(".my_button").click(/* an example of event binding * /);
  * 
  *         // if you have some asynchronous operations, it's a good idea to return

From 5415856081b3051d96f02bda1fd8146b17aafdbf Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:27:48 +0200
Subject: [PATCH 133/167] [REM] unused openerp.base.Database.option_id

bzr revid: xmo@openerp.com-20110801092748-nt4oqyoetxojfc4o
---
 addons/base/static/src/js/chrome.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 1eb963bd9d7..4b98e49fab6 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -672,7 +672,6 @@ openerp.base.Loading =  openerp.base.Controller.extend({
 openerp.base.Database = openerp.base.Controller.extend({
     init: function(parent, element_id, option_id) {
         this._super(parent, element_id);
-        this.option_id = option_id;
         this.$option_id = $('#' + option_id);
     },
     start: function() {

From 79d5db4bfce54bb5b222e2704e459a76e822e037 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:28:29 +0200
Subject: [PATCH 134/167] [REM] missed a uniqueid generation in fetching db
 langs

bzr revid: xmo@openerp.com-20110801092829-boojzjfdi4achv1o
---
 addons/base/static/src/js/chrome.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 4b98e49fab6..9c3de0c6f41 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -691,16 +691,15 @@ openerp.base.Database = openerp.base.Controller.extend({
                 self.lang_list = result.lang_list;
                 self.do_db_create();
             } else {
-                var db_error_dialog = _.uniqueId("db_error_dialog");
-                    $('
      ', {id: db_error_dialog}).dialog({
-                        modal: true,
-                        title: result.title,
-                        buttons: {
-                            Ok: function() {
-                                $(this).dialog("close");
-                            }
+                $('
      ').dialog({
+                    modal: true,
+                    title: result.title,
+                    buttons: {
+                        Ok: function() {
+                            $(this).dialog("close");
                         }
-                   }).html(result.error);
+                    }
+               }).html(result.error);
             }
         });
         

From 9103c34ef900ab43fa0afe7206ad3f422c66d09d Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:31:30 +0200
Subject: [PATCH 135/167] [FIX] very unlikely race condition in case fetching
 db list hangs and user switches to dropping db before it's come back

bzr revid: xmo@openerp.com-20110801093130-fxp2sjx4aabta826
---
 addons/base/static/src/js/chrome.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 9c3de0c6f41..05a37f58b7f 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -682,14 +682,12 @@ openerp.base.Database = openerp.base.Controller.extend({
         
         var self = this;
         
-        this.rpc("/base/database/get_databases_list", {}, function(result) {
+        var fetch_db = this.rpc("/base/database/get_databases_list", {}, function(result) {
             self.db_list = result.db_list;
         });
-        
-        this.rpc("/base/session/get_lang_list", {}, function(result) {
+        var fetch_langs = this.rpc("/base/session/get_lang_list", {}, function(result) {
             if (!result.error) {
                 self.lang_list = result.lang_list;
-                self.do_db_create();
             } else {
                 $('
      ').dialog({
                     modal: true,
@@ -702,6 +700,7 @@ openerp.base.Database = openerp.base.Controller.extend({
                }).html(result.error);
             }
         });
+        $.when(fetch_db, fetch_langs).then(function () {self.do_db_create();});
         
         this.$element.find('#db-create').click(this.do_db_create);
         this.$element.find('#db-drop').click(this.do_db_drop);

From 292ff1e17ad9ab0b6a8866c799f9008777be4064 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 11:56:49 +0200
Subject: [PATCH 136/167] [FIX] synchronized operations aware of the dblist, so
 the backup tab does not suggest dumping a DB which was just dropped moments
 before

bzr revid: xmo@openerp.com-20110801095649-kryicm6lds41m3e1
---
 addons/base/static/src/js/chrome.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 05a37f58b7f..fe8a52b3ffb 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -712,7 +712,19 @@ openerp.base.Database = openerp.base.Controller.extend({
             self.header.on_logout();	
         });
     },
-    
+    /**
+     * Converts a .serializeArray() result into a dict. Does not bother folding
+     * multiple identical keys into an array, last key wins.
+     *
+     * @param {Array} array
+     */
+    to_object: function (array) {
+        var result = {};
+        _(array).each(function (record) {
+            result[record.name] = record.value;
+        });
+        return result;
+    },
     do_db_create: function() {
         var self = this;
        	self.$option_id.html(QWeb.render("CreateDB", self));
@@ -734,9 +746,10 @@ openerp.base.Database = openerp.base.Controller.extend({
        	    var fields = $(this).serializeArray();
             self.rpc("/base/database/create_db", {'fields': fields},
             function(result) {
-                if (result && !result.error) {
-
-                } else if(result.error) {
+                if (!result.error) {
+                    self.db_list.push(self.to_object(fields)['db_name']);
+                    self.db_list.sort();
+                } else {
                     $('
      ').dialog({
                         modal: true,
                         title: result.title,
@@ -767,6 +780,8 @@ openerp.base.Database = openerp.base.Controller.extend({
 	            self.rpc("/base/database/drop_db", {'fields': fields}, function(result) {
                     if (result && ! result.error) {
                         self.$option_id.find("select[name=drop_db] :selected").remove();
+                        self.db_list.splice(
+                                _.indexOf(self.db_list, db, true), 1);
                         self.notification.notify("Dropping database", "The database '" + db + "' has been dropped");
                     } else if(result.error) {
                         $('
      ').dialog({

From c6f9cb5eb69427ab0353977dac8088f5487c5119 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 12:44:53 +0200
Subject: [PATCH 137/167] [FIX] improve usage of jquery validator, don't
 trigger RPC requests on invalid forms

* Use jquery.validate's submitHandler callback so the RPC calls are *only* performed when forms are valid
* Move rules creation to markup when possible
* Setup basic rule failure messages in validate() call, not afterwards

bzr revid: xmo@openerp.com-20110801104453-a3iuyn033en57495
---
 addons/base/static/src/js/chrome.js | 247 ++++++++++++----------------
 addons/base/static/src/xml/base.xml |  26 +--
 2 files changed, 123 insertions(+), 150 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index fe8a52b3ffb..1c5f9f05e1f 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -728,39 +728,27 @@ openerp.base.Database = openerp.base.Controller.extend({
     do_db_create: function() {
         var self = this;
        	self.$option_id.html(QWeb.render("CreateDB", self));
-       	
-       	$("form[name=create_db_form]").validate();
-       	
-       	$("input[name=create_confirm_pwd]").rules("add", {
-            equalTo: 'input[name=create_admin_pwd]',
-            messages: {
-                required: "Password did not match !"
-            }
-        });
-        
-       	$("input[name=super_admin_pwd]").focus();
-       	
-       	self.$option_id.find('form[name=create_db_form]').submit(function(ev) {
-       	    ev.preventDefault();
-       	
-       	    var fields = $(this).serializeArray();
-            self.rpc("/base/database/create_db", {'fields': fields},
-            function(result) {
-                if (!result.error) {
-                    self.db_list.push(self.to_object(fields)['db_name']);
-                    self.db_list.sort();
-                } else {
-                    $('
      ').dialog({
-                        modal: true,
-                        title: result.title,
-                        buttons: {
-                            Ok: function() {
-                                $(this).dialog("close");
+
+        self.$option_id.find("form[name=create_db_form]").validate({
+            submitHandler: function (form) {
+                var fields = $(form).serializeArray();
+                self.rpc("/base/database/create_db", {'fields': fields}, function(result) {
+                    if (!result.error) {
+                        self.db_list.push(self.to_object(fields)['db_name']);
+                        self.db_list.sort();
+                    } else {
+                        $('
      ').dialog({
+                            modal: true,
+                            title: result.title,
+                            buttons: {
+                                Ok: function() {
+                                    $(this).dialog("close");
+                                }
                             }
-                        }
-                    }).html(result.error);
-                }
-            });
+                        }).html(result.error);
+                    }
+                });
+            }
         });
     },
 	
@@ -768,22 +756,23 @@ openerp.base.Database = openerp.base.Controller.extend({
         var self = this;
        	self.$option_id.html(QWeb.render("DropDB", self));
        	
-       	$("form[name=drop_db_form]").validate();
-       	
-        self.$option_id.find('form[name=drop_db_form]').submit(function(ev) {
-       	    ev.preventDefault();
-       	
-	        var fields = $(this).serializeArray();
-	        var db = $('select[name=drop_db] :selected').val();
-	        
-	        if (confirm("Do you really want to delete the database: " + db + " ?")) {
-	            self.rpc("/base/database/drop_db", {'fields': fields}, function(result) {
-                    if (result && ! result.error) {
-                        self.$option_id.find("select[name=drop_db] :selected").remove();
+       	self.$option_id.find("form[name=drop_db_form]").validate({
+            submitHandler: function (form) {
+                var $form = $(form),
+                    fields = $form.serializeArray(),
+                    $db_list = $form.find('select[name=drop_db]'),
+                    db = $db_list.val();
+
+                if (!confirm("Do you really want to delete the database: " + db + " ?")) {
+                    return;
+                }
+                self.rpc("/base/database/drop_db", {'fields': fields}, function(result) {
+                    if (! result.error) {
+                        $db_list.find(':selected').remove();
                         self.db_list.splice(
                                 _.indexOf(self.db_list, db, true), 1);
                         self.notification.notify("Dropping database", "The database '" + db + "' has been dropped");
-                    } else if(result.error) {
+                    } else {
                         $('
      ').dialog({
                             modal: true,
                             title: result.title,
@@ -802,99 +791,15 @@ openerp.base.Database = openerp.base.Controller.extend({
     do_db_backup: function() {
         var self = this;
        	self.$option_id.html(QWeb.render("BackupDB", self));
-       	
-       	$("form[name=backup_db_form]").validate();
-       	
-       	self.$option_id.find('form[name=backup_db_form]').submit(function(ev) {
-       	    ev.preventDefault();
-       	
-            var fields = $(this).serializeArray();
-            
-            self.rpc("/base/database/backup_db", {'fields': fields}, function(result) {
-                if (result && !result.error) {
-                    self.notification.notify("Backup Database", "Backup has been created for the database");
-                } else if(result.error) {
-                    $('
      ').dialog({
-                        modal: true,
-                        title: result.title,
-                        buttons: {
-                            Ok: function() {
-                                $(this).dialog("close");
-                            }
-                        }
-                    }).html(result.error);
-               }
-            });
-       	});
-    },
-    
-    do_db_restore: function() {
-        var self = this;
-       	self.$option_id.html(QWeb.render("RestoreDB", self));
-       	
-       	$("form[name=restore_db_form]").validate();
-       	
-       	self.$option_id.find('form[name=restore_db_form]').submit(function(ev) {
-       	    ev.preventDefault();
-       	
-            var fields = $(this).serializeArray();
-       	
-            self.rpc("/base/database/restore_db", {'fields': fields}, 
-            function(result) {
-                if (result && !result.error) {
-                   self.notification.notify("Restore Database", "You restored your database");
-                } else if(result.error) {
-                    $('
      ').dialog({
-                        modal: true,
-                        title: result.title,
-                        buttons: {
-                            Ok: function() {
-                                $(this).dialog("close");
-                            }
-                        }
-                    }).html(result.error);
-                }
-            });
-       	});
-    },
 
-    do_change_password: function() {
-        var self = this;
-       	self.$option_id.html(QWeb.render("Change_DB_Pwd", self));
-       	
-       	$("form[name=change_pwd_form]").validate();
-       	
-       	$("input[name=old_pwd]").rules("add", {
-            minlength: 1,
-            messages: {
-                required: "Please enter password !"
-            }
-        });
-        $("input[name=new_pwd]").rules("add", {
-            minlength: 1,
-            messages: {
-                required: "Please enter password !"
-            }
-        });
-        $("input[name=confirm_pwd]").rules("add", {
-            equalTo: 'input[name=new_pwd]',
-            messages: {
-                required: "Password did not match !"
-            }
-        });
+        self.$option_id.find("form[name=backup_db_form]").validate({
+            submitHandler: function (form) {
+                var fields = $(form).serializeArray();
 
-        $("input[name=old_pwd]").focus();
-        
-       	self.$option_id.find('form[name=change_pwd_form]').submit(function(ev) {
-       	    ev.preventDefault();
-       	    
-       	    var fields = $(this).serializeArray();
-
-            self.rpc("/base/database/change_password_db", {'fields': fields}, 
-               function(result) {
-                   if (result && !result.error) {
-                      self.notification.notify("Changed Password", "Password has been changed successfully");
-                   } else if(result.error) {
+                self.rpc("/base/database/backup_db", {'fields': fields}, function(result) {
+                    if (!result.error) {
+                        self.notification.notify("Backup Database", "Backup has been created for the database");
+                    } else {
                         $('
      ').dialog({
                             modal: true,
                             title: result.title,
@@ -904,11 +809,73 @@ openerp.base.Database = openerp.base.Controller.extend({
                                 }
                             }
                         }).html(result.error);
-                   }
-               });
-           	});
-    }
+                    }
+                });
+            }
+        });
+    },
+    
+    do_db_restore: function() {
+        var self = this;
+       	self.$option_id.html(QWeb.render("RestoreDB", self));
+       	
+       	self.$option_id.find("form[name=restore_db_form]").validate({
+            submitHandler: function (form) {
+                var fields = $(form).serializeArray();
 
+                self.rpc("/base/database/restore_db", {'fields': fields}, function(result) {
+                    if (!result.error) {
+                       self.notification.notify("Restore Database", "You restored your database");
+                    } else {
+                        $('
      ').dialog({
+                            modal: true,
+                            title: result.title,
+                            buttons: {
+                                Ok: function() {
+                                    $(this).dialog("close");
+                                }
+                            }
+                        }).html(result.error);
+                    }
+                });
+            }
+        });
+    },
+
+    do_change_password: function() {
+        var self = this;
+       	self.$option_id.html(QWeb.render("Change_DB_Pwd", self));
+
+        self.$option_id.find("form[name=change_pwd_form]").validate({
+            messages: {
+                old_pwd: "Please enter your previous password",
+                new_pwd: "Please enter your new password",
+                confirm_pwd: {
+                    required: "Please confirm your new password",
+                    equalTo: "The confirmation does not match the password"
+                }
+            },
+            submitHandler: function (form) {
+                var fields = $(form).serializeArray();
+
+                self.rpc("/base/database/change_password_db", {'fields': fields}, function(result) {
+                    if (!result.error) {
+                        self.notification.notify("Changed Password", "Password has been changed successfully");
+                    } else {
+                        $('
      ').dialog({
+                            modal: true,
+                            title: result.title,
+                            buttons: {
+                                Ok: function() {
+                                    $(this).dialog("close");
+                                }
+                            }
+                        }).html(result.error);
+                    }
+                });
+            }
+        });
+    }
 });
 
 openerp.base.Login =  openerp.base.Controller.extend({
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index de55e154dbc..ec8000919a6 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -80,7 +80,8 @@
         
    
                         &nbsp;
    
         
         
     
    
 
             
         
    
     
    
 
 
    
-                
+                
@@ -100,7 +101,7 @@
                             
-            
+                
@@ -108,7 +109,8 @@
             
-                
+                
@@ -129,9 +131,9 @@
             
-                
                         
-                           	
+                            
                         
                     
                 
@@ -160,7 +162,7 @@
                 
    
             
    
                 
             
    
             
    
                 
                         
                     
             
    
             
    
                 
    
             
    
                 
             
    
             
    
                 
    
                 
                 
                 
                     
-                    
                             
                                	
                             
@@ -190,7 +192,8 @@
         
-                
+                
@@ -218,15 +221,18 @@
         
    
             
    
                 
             
    
             
    
                 
    
-                
+                
-       	    
+       	    
-                
+                

From 5ebea36bf979ff5ec42c9ca0ed0c85974d19f548 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 12:52:31 +0200
Subject: [PATCH 138/167] [FIX] broken markup in drop db template leading to
 broken rendering

bzr revid: xmo@openerp.com-20110801105231-xbxxzyx8rbr9wg7a
---
 addons/base/static/src/xml/base.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index ec8000919a6..3e82e0cda8b 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -130,13 +130,15 @@
         
    
             
    
                 
             
    
             
    
             
             
    
    	    
    
                 
             
    
             
    
                 
    
-                
-                    
-                
+                

From 4aed9098caccee34685cf20886a52830d47c64a9 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 12:58:38 +0200
Subject: [PATCH 139/167] [IMP] don't duplicate en_US lang in create db, remove
 redundant  elements in select templates

bzr revid: xmo@openerp.com-20110801105838-5arrf4nppsle5akt
---
 addons/base/controllers/main.py     |  7 +++---
 addons/base/static/src/xml/base.xml | 38 +++++++++++++----------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 14a0a352079..36575f504c7 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -253,12 +253,13 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def get_lang_list(self, req):
-        lang_list = [('en_US', 'English (US)')]
         try:
-            lang_list = lang_list + (req.session.proxy("db").list_lang() or [])
+            return {
+                'lang_list': (req.session.proxy("db").list_lang() or []),
+                'error': ""
+            }
         except Exception, e:
             return {"error": e, "title": "Languages"}
-        return {"lang_list": lang_list, "error": ""}
             
     @openerpweb.jsonrequest
     def modules(self, req):
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 3e82e0cda8b..0e3d9c9a19c 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -94,13 +94,13 @@
             
@@ -131,13 +131,11 @@
             
@@ -163,13 +161,11 @@
             

From 56ebc5946cb9304babe3930494c362e0d090782f Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 14:33:02 +0200
Subject: [PATCH 140/167] [FIX] for some reason, my IDE does *not* enjoy
 getting 3MB of binary data dumped into its log view. Only display the size of
 the data returned in case of http requests

bzr revid: xmo@openerp.com-20110801123302-tfs1jw3kmlnji0ra
---
 openerpweb/openerpweb.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 1e5c3cf8b92..8700edb95bb 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -374,7 +374,10 @@ class HttpRequest(object):
             akw = dict([(key, kw[key] if isinstance(kw[key], basestring) else type(kw[key])) for key in kw.keys()])
             print "POST --> %s.%s %s %r" % (controller.__class__.__name__, f.__name__, request, akw)
         r = f(controller, self, **kw)
-        print "<--", r
+        if isinstance(r, str):
+            print "<--", len(r), 'bytes'
+        else:
+            print "<--", len(r), 'characters'
         print
         return r
 

From 0fd884d234f3ee4969dc4265da1a1aecc320717f Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 15:12:54 +0200
Subject: [PATCH 141/167] [FIX] fully reimplement dumping a DB so that it works
 correctly

* handler should be an httprequest, as we're returning a binary file (maybe we could use ajax with file API abd b64, but... not now)
* use cookie-hack to know when the file is downloading (or is finished downloading, not sure which, not that it matters) so we can add some kind of UI signal

bzr revid: xmo@openerp.com-20110801131254-ik4m8yyc526pz7rf
---
 addons/base/controllers/main.py     | 20 +++++------
 addons/base/static/src/js/chrome.js | 55 ++++++++++++++++++++---------
 addons/base/static/src/xml/base.xml |  4 ++-
 3 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 36575f504c7..6df4287e071 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -191,18 +191,16 @@ class Database(openerpweb.Controller):
                 return {'error': e.faultCode, 'title': 'Drop Database'}
         return {'error': 'Could not drop database !', 'title': 'Drop Database'}
 
-    @openerpweb.jsonrequest
-    def backup_db(self, req, fields):
-        password, db = operator.itemgetter(
-            'backup_pwd', 'backup_db')(
-                dict(map(operator.itemgetter('name', 'value'), fields)))
-
+    @openerpweb.httprequest
+    def backup_db(self, req, backup_db, backup_pwd, token):
         try:
-            res = req.session.proxy("db").dump(password, db)
-            if res:
-                cherrypy.response.headers['Content-Type'] = "application/data"
-                cherrypy.response.headers['Content-Disposition'] = 'filename="' + db + '.dump"'
-                return base64.decodestring(res)
+            db_dump = base64.decodestring(
+                req.session.proxy("db").dump(backup_pwd, backup_db))
+            cherrypy.response.headers['Content-Type'] = "application/octet-stream; charset=binary"
+            cherrypy.response.headers['Content-Disposition'] = 'attachment; filename="' + backup_db + '.dump"'
+            cherrypy.response.cookie['fileToken'] = token
+            cherrypy.response.cookie['fileToken']['path'] = '/'
+            return db_dump
         except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
                 return {'error': e.faultCode, 'title': 'Backup Database'}
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 1c5f9f05e1f..cf3e9b1ef2b 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -787,30 +787,51 @@ openerp.base.Database = openerp.base.Controller.extend({
             }
         });
     },
-    
+
+    wait_for_file: function (token, cleanup) {
+        var cookie_name = 'fileToken',
+            cookie_length = cookie_name.length;
+        var timer = setInterval(function () {
+            var cookies = document.cookie.split(';');
+            for(var i=0; i
    
             
    
                 
+                    
+                        
+                    
+                
             
    
             
    
                 
    
                 
                 
-                    
-                        
-                    
+                    
                 
             
    
             
    
                 
                 
-                    
-                        
-                    
+                    
                 
             
    
             
    
                 
                 
-                    
-                        
-                    
+                    
                 
             
    
             
    
             
    
                 

From 68cb923ec6d75a356575f276180124628e955c9f Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 16:47:28 +0200
Subject: [PATCH 142/167] [FIX] backup restoration, works almost 60% of the
 time

bzr revid: xmo@openerp.com-20110801144728-zh1d6nqpf19i6x7p
---
 addons/base/__openerp__.py          |  1 +
 addons/base/controllers/main.py     | 25 ++++++++++++++-----------
 addons/base/static/src/js/chrome.js | 23 ++++++++---------------
 addons/base/static/src/xml/base.xml |  2 +-
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index e17e2d82c6d..3195ac4d7e0 100644
--- a/addons/base/__openerp__.py
+++ b/addons/base/__openerp__.py
@@ -6,6 +6,7 @@
     'js' : [
         "static/lib/datejs/date-en-US.js",
         "static/lib/jquery/jquery-1.5.2.js",
+        "static/lib/jquery.form/jquery.form.js",
         "static/lib/jquery.validate/jquery.validate.js",
         "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
         "static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js",
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 6df4287e071..e1f30fd5b70 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -206,20 +206,23 @@ class Database(openerpweb.Controller):
                 return {'error': e.faultCode, 'title': 'Backup Database'}
         return {'error': 'Could not drop database !', 'title': 'Backup Database'}
             
-    @openerpweb.jsonrequest
-    def restore_db(self, req, fields):
-        password, db, filename = operator.itemgetter(
-            'restore_pwd', 'new_db', 'value')(
-                dict(map(operator.itemgetter('name', 'value'), fields)))
-
+    @openerpweb.httprequest
+    def restore_db(self, req, db_file, restore_pwd, new_db):
+        response = None
         try:
-            data = base64.encodestring(filename.file.read())
-            return req.session.proxy("db").restore(password, db, data)
+            data = base64.encodestring(db_file.file.read())
+            response = simplejson.dumps(
+                req.session.proxy("db").restore(restore_pwd, new_db, data))
         except xmlrpclib.Fault, e:
             if e.faultCode and e.faultCode.split(':')[0] == 'AccessDenied':
-                return {'error': e.faultCode, 'title': 'Restore Database'}
-        return {'error': 'Could not restore database !', 'title': 'Restore Database'}
-        
+                response = simplejson.dumps({'error': e.faultCode, 'title': 'Restore Database'})
+        if not response:
+            response = simplejson.dumps({'error': 'Could not restore database !', 'title': 'Restore Database'})
+
+        cherrypy.response.headers['Content-Type'] = 'application/json'
+        cherrypy.response.headers['Content-Length'] = len(response)
+        return response
+
     @openerpweb.jsonrequest
     def change_password_db(self, req, fields):
         old_password, new_password = operator.itemgetter(
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index cf3e9b1ef2b..7e415ea83f5 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -842,21 +842,14 @@ openerp.base.Database = openerp.base.Controller.extend({
        	
        	self.$option_id.find("form[name=restore_db_form]").validate({
             submitHandler: function (form) {
-                var fields = $(form).serializeArray();
-
-                self.rpc("/base/database/restore_db", {'fields': fields}, function(result) {
-                    if (!result.error) {
-                       self.notification.notify("Restore Database", "You restored your database");
-                    } else {
-                        $('
    ').dialog({
-                            modal: true,
-                            title: result.title,
-                            buttons: {
-                                Ok: function() {
-                                    $(this).dialog("close");
-                                }
-                            }
-                        }).html(result.error);
+                $(form).ajaxSubmit({
+                    url: '/base/database/restore_db',
+                    type: 'POST',
+                    dataType: 'json',
+                    resetForm: true,
+                    success: function () {
+                        // TODO: ui manipulations
+                        // note: response objects don't work
                     }
                 });
             }
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 4187f1faf9c..efd8b939661 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -192,7 +192,7 @@
         
-                

From 7c1ecda162a46fed8b8221339b0c6e3e513f6a2e Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 16:54:37 +0200
Subject: [PATCH 143/167] [FIX] get correct field name in chane_password method

bzr revid: xmo@openerp.com-20110801145437-x0qyfk5fsg7ivc9o
---
 addons/base/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index e1f30fd5b70..51b7618a03b 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -226,7 +226,7 @@ class Database(openerpweb.Controller):
     @openerpweb.jsonrequest
     def change_password_db(self, req, fields):
         old_password, new_password = operator.itemgetter(
-            'old_pwd', 'value')(
+            'old_pwd', 'new_pwd')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
         try:
             return req.session.proxy("db").change_admin_password(old_password, new_password)

From e1b3207935cab017fba038ac666e4c04c0f6be4f Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Mon, 1 Aug 2011 17:02:31 +0200
Subject: [PATCH 144/167] [FIX] implement going back to the login page by just
 reloading the whole bloody thing

bzr revid: xmo@openerp.com-20110801150231-wr8h550mr7ixx0ue
---
 addons/base/static/src/js/chrome.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 7e415ea83f5..1011a029570 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -708,8 +708,7 @@ openerp.base.Database = openerp.base.Controller.extend({
         this.$element.find('#db-restore').click(this.do_db_restore);
         this.$element.find('#db-change-password').click(this.do_change_password);
        	this.$element.find('#back-to-login').click(function() {
-            self.header = new openerp.base.Header(self, "oe_header");
-            self.header.on_logout();	
+            window.location.reload();
         });
     },
     /**

From 29bbb4601ef67e7cd00bbafd8aac1710175f13d9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi 
Date: Mon, 1 Aug 2011 17:48:56 +0200
Subject: [PATCH 145/167] [ADD] Added a sidebar to the calendar view

bzr revid: fme@openerp.com-20110801154856-2nhjjtjwa1jc8qy1
---
 addons/base/static/src/css/base.css           |  7 ++
 addons/base_calendar/controllers/main.py      |  4 +-
 .../base_calendar/static/src/js/calendar.js   | 98 +++++++++++++++----
 .../static/src/xml/base_calendar.xml          | 47 +++++----
 4 files changed, 110 insertions(+), 46 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index b173386e234..32345151353 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -1099,3 +1099,10 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
     font-size: 1.2em;
     font-weight: bold;
 }
+
+.openerp .dhx_mini_calendar {
+    -moz-box-shadow: none;
+    -khtml-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
diff --git a/addons/base_calendar/controllers/main.py b/addons/base_calendar/controllers/main.py
index 41ede2bb7ab..28c871bf2b4 100644
--- a/addons/base_calendar/controllers/main.py
+++ b/addons/base_calendar/controllers/main.py
@@ -5,6 +5,6 @@ class CalendarView(View):
     _cp_path = "/base_calendar/calendarview"
     
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req, model, view_id, 'calendar')
+    def load(self, req, model, view_id, toolbar=False):
+        fields_view = self.fields_view_get(req, model, view_id, 'calendar', toolbar=toolbar)
         return {'fields_view': fields_view}
diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
index 04b75193974..18299655dc3 100644
--- a/addons/base_calendar/static/src/js/calendar.js
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -15,10 +15,11 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         this.view_id = view_id;
         this.domain = this.dataset.domain || [];
         this.context = this.dataset.context || {};
+        this.has_been_loaded = $.Deferred();
         this.options = options || {};
     },
     start: function() {
-        this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+        this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded);
     },
     on_loaded: function(data) {
         this.calendar_fields = {};
@@ -54,8 +55,23 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
             this.info_fields.push(this.fields_view.arch.children[fld].attrs.name);
         }
         this.$element.html(QWeb.render("CalendarView", {"fields_view": this.fields_view}));
+
+        if (this.options.sidebar && this.options.sidebar_id) {
+            this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id);
+            this.sidebar.start();
+            this.sidebar.navigator = new openerp.base_calendar.SidebarNavigator(this.sidebar, this.sidebar.add_section('navigator', "Navigator"), this);
+            this.sidebar.responsible = new openerp.base_calendar.SidebarResponsible(this.sidebar, this.sidebar.add_section('responsible', "Responsible"), this);
+            this.sidebar.add_toolbar(data.fields_view.toolbar);
+            this.set_common_sidebar_sections(this.sidebar);
+            this.sidebar.do_unfold();
+            this.sidebar.do_fold.add_last(this.resize_scheduler);
+            this.sidebar.do_unfold.add_last(this.resize_scheduler);
+            this.sidebar.do_toggle.add_last(this.resize_scheduler);
+        }
+
         this.init_scheduler();
         this.load_scheduler();
+        this.has_been_loaded.resolve();
     },
     init_scheduler: function() {
         var self = this;
@@ -76,8 +92,6 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         // Initialize Sceduler
         scheduler.init('openerp_scheduler', null, this.mode);
 
-        this.$element.find('#dhx_minical_icon').bind('click', this.mini_calendar);
-
         // Event Options Click,edit
         scheduler.attachEvent('onDblClick', this.popup_event);
 
@@ -120,6 +134,17 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
                 return true;
             }
         });
+        scheduler.renderCalendar({
+            container: this.sidebar.navigator.element_id,
+            navigation: true,
+            date: scheduler._date,
+            handler: function(date, calendar) {
+                scheduler.setCurrentView(date, 'day');
+            }
+        });
+    },
+    resize_scheduler: function() {
+        scheduler.setCurrentView(scheduler._date);
     },
     load_scheduler: function() {
         var self = this;
@@ -142,7 +167,9 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         scheduler.clearAll();
 
         //To parse Events we have to convert date Format
-        var res_events = [];
+        var res_events = [],
+            sidebar_items = [],
+            sidebar_ids = [];
         for (var e = 0; e < events.length; e++) {
             var evt = events[e];
             if (!evt[this.date_start]) {
@@ -156,10 +183,26 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
             if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') {
                 evt[this.date_stop] = openerp.base.parse_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
             }
+            if (this.color_field) {
+                var user = evt[this.color_field];
+                if (user) {
+                    if (_.indexOf(sidebar_ids, user[0]) === -1) {
+                        sidebar_items.push({
+                            id: user[0],
+                            name: user[1],
+                            // TODO: use color table
+                            color: '#dddddd'
+                        });
+                        sidebar_ids.push(user[0]);
+                    }
+                }
+            }
             res_events.push(this.convert_event(evt));
         }
 
         scheduler.parse(res_events, 'json');
+        this.resize_scheduler();
+        this.sidebar.responsible.on_events_loaded(sidebar_items);
     },
     convert_event: function(event) {
         var starts = event[this.date_start],
@@ -240,21 +283,6 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
             'title': res_description.join()
         }
     },
-    mini_calendar: function() {
-        if (scheduler.isCalendarVisible()) {
-            scheduler.destroyCalendar();
-        } else {
-            scheduler.renderCalendar({
-                position:"dhx_minical_icon",
-                date:scheduler._date,
-                navigation:true,
-                handler: function(date, calendar) {
-                   scheduler.setCurrentView(date);
-                   scheduler.destroyCalendar()
-                }
-            });
-        }
-    },
     do_search: function(domains, contexts, groupbys) {
         var self = this;
         this.rpc('/base/session/eval_domain_and_context', {
@@ -271,10 +299,19 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         });
     },
     do_show: function () {
-        this.$element.show();
+        var self = this;
+        $.when(this.has_been_loaded).then(function() {
+            self.$element.show();
+            if (self.sidebar) {
+                self.sidebar.$element.show();
+            }
+        });
     },
     do_hide: function () {
         this.$element.hide();
+        if (this.sidebar) {
+            this.sidebar.$element.hide();
+        }
     },
     popup_event: function(event_id) {
         var self = this;
@@ -325,6 +362,27 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
         }
     }
 });
+
+openerp.base_calendar.SidebarResponsible = openerp.base.Widget.extend({
+    init: function(parent, element_id, view) {
+        this._super(parent, element_id);
+        this.view = view;
+    },
+    on_events_loaded: function(users) {
+        this.$element.html(QWeb.render('CalendarView.sidebar.responsible', { users : users }));
+        // TODO: bind checkboxes reload sheduler
+    }
+});
+
+openerp.base_calendar.SidebarNavigator = openerp.base.Widget.extend({
+    init: function(parent, element_id, view) {
+        this._super(parent, element_id);
+        this.view = view;
+    },
+    on_events_loaded: function(events) {
+    }
+});
+
 };
 
 // DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner'))
diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/base_calendar/static/src/xml/base_calendar.xml
index 59f77cbb0bc..757c4925cd1 100644
--- a/addons/base_calendar/static/src/xml/base_calendar.xml
+++ b/addons/base_calendar/static/src/xml/base_calendar.xml
@@ -1,27 +1,26 @@
 

From 71862dfc3507556d803155ccaa9b8dc9b3f84492 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Tue, 2 Aug 2011 09:00:07 +0200
Subject: [PATCH 146/167] [IMP] block UI during db creation

bzr revid: xmo@openerp.com-20110802070007-z3ameuhsr84w51cs
---
 addons/base/__openerp__.py          |  1 +
 addons/base/controllers/main.py     |  6 +++++-
 addons/base/static/src/js/chrome.js | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/addons/base/__openerp__.py b/addons/base/__openerp__.py
index 3195ac4d7e0..7fa373d1ba0 100644
--- a/addons/base/__openerp__.py
+++ b/addons/base/__openerp__.py
@@ -10,6 +10,7 @@
         "static/lib/jquery.validate/jquery.validate.js",
         "static/lib/jquery.ba-bbq/jquery.ba-bbq.js",
         "static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js",
+        "static/lib/jquery.blockui/jquery.blockUI.js",
         "static/lib/jquery.superfish/js/hoverIntent.js",
         "static/lib/jquery.superfish/js/superfish.js",
         "static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js",
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 51b7618a03b..25763a42537 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -162,7 +162,11 @@ class Database(openerpweb.Controller):
         r = cherrypy.config['openerp.dbfilter'].replace('%h', h).replace('%d', d)
         dbs = [i for i in dbs if re.match(r, i)]
         return {"db_list": dbs}
-    
+
+    @openerpweb.jsonrequest
+    def progress(self, req, password, id):
+        return req.session.proxy('db').get_progress(password, id)
+
     @openerpweb.jsonrequest
     def create_db(self, req, fields):
 
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 1011a029570..558d4322f53 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -724,6 +724,28 @@ openerp.base.Database = openerp.base.Controller.extend({
         });
         return result;
     },
+    wait_for_newdb: function (db_creation_id, password) {
+        var self = this;
+        self.rpc('/base/database/progress', {
+            id: db_creation_id,
+            password: password
+        }, function (result) {
+            var progress = result[0];
+            // I'd display a progress bar, but turns out the progress status
+            // the server report kind-of blows goats: it's at 0 for ~75% of
+            // the installation, then jumps to 75%, then jumps down to either
+            // 0 or ~40%, then back up to 75%, then terminates. Let's keep that
+            // mess hidden behind a not-very-useful but not overly weird
+            // message instead.
+            if (progress < 1) {
+                setTimeout(function () {
+                    self.wait_for_newdb(db_creation_id, password);
+                }, 500);
+                return;
+            }
+            $.unblockUI();
+        });
+    },
     do_db_create: function() {
         var self = this;
        	self.$option_id.html(QWeb.render("CreateDB", self));
@@ -731,11 +753,15 @@ openerp.base.Database = openerp.base.Controller.extend({
         self.$option_id.find("form[name=create_db_form]").validate({
             submitHandler: function (form) {
                 var fields = $(form).serializeArray();
+                $.blockUI();
                 self.rpc("/base/database/create_db", {'fields': fields}, function(result) {
                     if (!result.error) {
                         self.db_list.push(self.to_object(fields)['db_name']);
                         self.db_list.sort();
+                        self.wait_for_newdb(
+                            result, self.to_object(fields)['super_admin_pwd']);
                     } else {
+                        $.unblockUI();
                         $('
    ').dialog({
                             modal: true,
                             title: result.title,

From 338b07614a79fcc8fedf2c1f7469fbfbe64be9ca Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Tue, 2 Aug 2011 09:25:51 +0200
Subject: [PATCH 147/167] [ADD] try to log user in at the end of DB install

bzr revid: xmo@openerp.com-20110802072551-qw3ngvnj40q2nv0k
---
 addons/base/static/src/js/chrome.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 558d4322f53..4618d41beea 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -724,11 +724,20 @@ openerp.base.Database = openerp.base.Controller.extend({
         });
         return result;
     },
-    wait_for_newdb: function (db_creation_id, password) {
+    /**
+     * Waits until the new database is done creating, then unblocks the UI and
+     * logs the user in as admin
+     *
+     * @param {Number} db_creation_id identifier for the db-creation operation, used to fetch the current installation progress
+     * @param {Object} info info fields for this database creation
+     * @param {String} info.db name of the database being created
+     * @param {String} info.password super-admin password for the database
+     */
+    wait_for_newdb: function (db_creation_id, info) {
         var self = this;
         self.rpc('/base/database/progress', {
             id: db_creation_id,
-            password: password
+            password: info.password
         }, function (result) {
             var progress = result[0];
             // I'd display a progress bar, but turns out the progress status
@@ -739,11 +748,14 @@ openerp.base.Database = openerp.base.Controller.extend({
             // message instead.
             if (progress < 1) {
                 setTimeout(function () {
-                    self.wait_for_newdb(db_creation_id, password);
+                    self.wait_for_newdb(db_creation_id, info);
                 }, 500);
                 return;
             }
             $.unblockUI();
+
+            var admin = result[1][0];
+            self.session.session_login(info.db, admin.login, admin.password)
         });
     },
     do_db_create: function() {
@@ -758,8 +770,12 @@ openerp.base.Database = openerp.base.Controller.extend({
                     if (!result.error) {
                         self.db_list.push(self.to_object(fields)['db_name']);
                         self.db_list.sort();
+                        var form_obj = self.to_object(fields);
                         self.wait_for_newdb(
-                            result, self.to_object(fields)['super_admin_pwd']);
+                            result, {
+                                password: form_obj['super_admin_pwd'],
+                                db: form_obj['db_name']
+                            });
                     } else {
                         $.unblockUI();
                         $('
    ').dialog({

From 0c153d1249372b77a2123f3d157e31eb0c2548e0 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Tue, 2 Aug 2011 09:36:54 +0200
Subject: [PATCH 148/167] [IMP] style fixes, avoid global Class object on
 window altogether

bzr revid: xmo@openerp.com-20110802073654-6ocsn0je4wmq1kag
---
 addons/base/static/src/js/core.js | 69 +++++++++++++++----------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 7623ec8d263..e57d79e40bb 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -9,10 +9,10 @@ openerp.base.core = function(openerp) {
 (function() {
   var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
   // The base Class implementation (does nothing)
-  this.Class = function(){};
+  openerp.base.Class = function(){};
 
   // Create a new Class that inherits from this class
-  Class.extend = function(prop) {
+  openerp.base.Class.extend = function(prop) {
     var _super = this.prototype;
 
     // Instantiate a base class (but only create the instance,
@@ -24,7 +24,7 @@ openerp.base.core = function(openerp) {
     // Copy the properties over onto the new prototype
     for (var name in prop) {
       // Check if we're overwriting an existing function
-      prototype[name] = typeof prop[name] == "function" && 
+      prototype[name] = typeof prop[name] == "function" &&
         typeof _super[name] == "function" && fnTest.test(prop[name]) ?
         (function(name, fn){
           return function() {
@@ -68,9 +68,6 @@ openerp.base.core = function(openerp) {
   };
 })();
 
-// todo change john resig class to keep window clean
-openerp.base.Class = window.Class
-
 openerp.base.callback = function(obj, method) {
     var callback = function() {
         var args = Array.prototype.slice.call(arguments);
@@ -123,7 +120,7 @@ openerp.base.callback = function(obj, method) {
 /**
  * Generates an inherited class that replaces all the methods by null methods (methods
  * that does nothing and always return undefined).
- * 
+ *
  * @param {Class} claz
  * @param {dict} add Additional functions to override.
  * @return {Class}
@@ -279,14 +276,14 @@ openerp.base.Registry = openerp.base.Class.extend( /** @lends openerp.base.Regis
 
 /**
  * Utility class that any class is allowed to extend to easy common manipulations.
- * 
+ *
  * It provides rpc calls, callback on all methods preceded by "on_" or "do_" and a
  * logging facility.
  */
 openerp.base.SessionAware = openerp.base.Class.extend({
     init: function(session) {
         this.session = session;
-        
+
         // Transform on_* method into openerp.base.callbacks
         for (var name in this) {
             if(typeof(this[name]) == "function") {
@@ -348,26 +345,26 @@ openerp.base.SessionAware = openerp.base.Class.extend({
 /**
  * Base class for all visual components. Provides a lot of functionalities helpful
  * for the management of a part of the DOM.
- * 
+ *
  * Widget handles:
  * - Rendering with QWeb.
  * - Life-cycle management and parenting (when a parent is destroyed, all its children are
  *     destroyed too).
  * - Insertion in DOM.
- * 
+ *
  * Widget also extends SessionAware for ease of use.
- * 
+ *
  * Guide to create implementations of the Widget class:
  * ==============================================
- * 
+ *
  * Here is a sample child class:
- * 
+ *
  * MyWidget = openerp.base.Widget.extend({
  *     // the name of the QWeb template to use for rendering
  *     template: "MyQWebTemplate",
  *     // identifier prefix, it is useful to put an obvious one for debugging
  *     identifier_prefix: 'my-id-prefix-',
- * 
+ *
  *     init: function(parent) {
  *         this._super(parent);
  *         // stuff that you want to init before the rendering
@@ -376,48 +373,48 @@ openerp.base.SessionAware = openerp.base.Class.extend({
  *         this._super();
  *         // stuff you want to make after the rendering, `this.$element` holds a correct value
  *         this.$element.find(".my_button").click(/* an example of event binding * /);
- * 
+ *
  *         // if you have some asynchronous operations, it's a good idea to return
  *         // a promise in start()
  *         var promise = this.rpc(...);
  *         return promise;
  *     }
  * });
- * 
+ *
  * Now this class can simply be used with the following syntax:
- * 
+ *
  * var my_widget = new MyWidget(this);
  * my_widget.appendTo($(".some-div"));
- * 
+ *
  * With these two lines, the MyWidget instance was inited, rendered, it was inserted into the
  * DOM inside the ".some-div" div and its events were binded.
- * 
+ *
  * And of course, when you don't need that widget anymore, just do:
- * 
+ *
  * my_widget.stop();
- * 
+ *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
 openerp.base.Widget = openerp.base.SessionAware.extend({
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
-     * 
+     *
      * @type string
      */
     template: null,
     /**
      * The prefix used to generate an id automatically. Should be redefined in
      * subclasses. If it is not defined, a generic identifier will be used.
-     * 
+     *
      * @type string
      */
     identifier_prefix: 'generic-identifier-',
     /**
-     * @constructs
      * Construct the widget and set its parent if a parent is given.
-     * 
-     * @param {Widget} parent Binds the current instance to the given Widget instance.
+     *
+     * @constructs
+     * @param {openerp.base.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling stop(), the current instance will be
      * destroyed too. Can be null.
      * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
@@ -433,7 +430,7 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
         this.element_id = this.element_id || _.uniqueId(this.identifier_prefix);
         var tmp = document.getElementById(this.element_id);
         this.$element = tmp ? $(tmp) : undefined;
-        
+
         this.widget_parent = parent;
         this.widget_children = [];
         if(parent && parent.widget_children) {
@@ -444,7 +441,7 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
     },
     /**
      * Render the current widget and appends it to the given jQuery object or Widget.
-     * 
+     *
      * @param target A jQuery object or a Widget instance.
      */
     appendTo: function(target) {
@@ -455,7 +452,7 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
     },
     /**
      * Render the current widget and prepends it to the given jQuery object or Widget.
-     * 
+     *
      * @param target A jQuery object or a Widget instance.
      */
     prependTo: function(target) {
@@ -466,7 +463,7 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
     },
     /**
      * Render the current widget and inserts it after to the given jQuery object or Widget.
-     * 
+     *
      * @param target A jQuery object or a Widget instance.
      */
     insertAfter: function(target) {
@@ -477,7 +474,7 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
     },
     /**
      * Render the current widget and inserts it before to the given jQuery object or Widget.
-     * 
+     *
      * @param target A jQuery object or a Widget instance.
      */
     insertBefore: function(target) {
@@ -497,8 +494,8 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
     /**
      * Renders the widget using QWeb, `this.template` must be defined.
      * The context given to QWeb contains the "widget" key that references `this`.
-     * 
-     * @param {object} additional Additional context arguments to pass to the template.
+     *
+     * @param {Object} additional Additional context arguments to pass to the template.
      */
     render: function (additional) {
         return QWeb.render(this.template, _.extend({widget: this}, additional || {}));
@@ -506,7 +503,7 @@ openerp.base.Widget = openerp.base.SessionAware.extend({
     /**
      * Method called after rendering. Mostly used to bind actions, perform asynchronous
      * calls, etc...
-     * 
+     *
      * By convention, the method should return a promise to inform the caller when
      * this widget has been initialized.
      *
@@ -571,5 +568,5 @@ openerp.base.OldWidget = openerp.base.Widget.extend({
     }
 });
 
-}
+};
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 093cbdbef9179894b98fd43f280f1f6be4437693 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Tue, 2 Aug 2011 10:10:22 +0200
Subject: [PATCH 149/167] [FIX] session not sticking on page reload, fix toggle
 back from database management to login window as well

bzr revid: xmo@openerp.com-20110802081022-30o15ju3bj88xaty
---
 addons/base/static/src/js/chrome.js | 30 ++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 4618d41beea..9d9bfc5549a 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -708,9 +708,23 @@ openerp.base.Database = openerp.base.Controller.extend({
         this.$element.find('#db-restore').click(this.do_db_restore);
         this.$element.find('#db-change-password').click(this.do_change_password);
        	this.$element.find('#back-to-login').click(function() {
-            window.location.reload();
+            self.stop();
         });
     },
+    stop: function () {
+        this.$option_id.empty();
+
+        this.$element
+            .find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login')
+                .unbind('click')
+            .end()
+            .closest(".openerp")
+                .addClass("login-mode")
+                .removeClass("database_block")
+            .end()
+            .empty();
+
+    },
     /**
      * Converts a .serializeArray() result into a dict. Does not bother folding
      * multiple identical keys into an array, last key wins.
@@ -966,18 +980,16 @@ openerp.base.Login =  openerp.base.Controller.extend({
     },
     display: function() {
         var self = this;
-        
+
         this.$element.html(QWeb.render("Login", this));
-        
-        this.$element.closest(".openerp").removeClass("database_block");
-    	this.$element.closest(".openerp").addClass("login-mode");
-    	
+        this.database = new openerp.base.Database(
+                this, "oe_database", "oe_db_options");
+
         this.$element.find('#oe-db-config').click(function() {
-            self.database = new openerp.base.Database(self, "oe_database", "oe_db_options");
             self.database.start();
         });
-        
-       this.$element.find("form").submit(this.on_submit);
+
+        this.$element.find("form").submit(this.on_submit);
     },
     on_login_invalid: function() {
         this.$element.closest(".openerp").addClass("login-mode");

From 82efc771fa7ca6e6db96c01dfe192240274904ed Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Tue, 2 Aug 2011 10:16:06 +0200
Subject: [PATCH 150/167] [ADD] forgotten to commit jquery form and blockUI O_o

bzr revid: xmo@openerp.com-20110802081606-jt6s3p421f7z2fju
---
 .../lib/jquery.blockUI/jquery.blockUI.js      | 499 ++++++++++
 .../static/lib/jquery.form/jquery.form.js     | 911 ++++++++++++++++++
 2 files changed, 1410 insertions(+)
 create mode 100644 addons/base/static/lib/jquery.blockUI/jquery.blockUI.js
 create mode 100644 addons/base/static/lib/jquery.form/jquery.form.js

diff --git a/addons/base/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/base/static/lib/jquery.blockUI/jquery.blockUI.js
new file mode 100644
index 00000000000..04db883c76e
--- /dev/null
+++ b/addons/base/static/lib/jquery.blockUI/jquery.blockUI.js
@@ -0,0 +1,499 @@
+/*!
+ * jQuery blockUI plugin
+ * Version 2.39 (23-MAY-2011)
+ * @requires jQuery v1.2.3 or later
+ *
+ * Examples at: http://malsup.com/jquery/block/
+ * Copyright (c) 2007-2010 M. Alsup
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * Thanks to Amir-Hossein Sobhi for some excellent contributions!
+ */
+
+;(function($) {
+
+if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) {
+	alert('blockUI requires jQuery v1.2.3 or later!  You are using v' + $.fn.jquery);
+	return;
+}
+
+$.fn._fadeIn = $.fn.fadeIn;
+
+var noOp = function() {};
+
+// this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle
+// retarded userAgent strings on Vista)
+var mode = document.documentMode || 0;
+var setExpr = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8);
+var ie6 = $.browser.msie && /MSIE 6.0/.test(navigator.userAgent) && !mode;
+
+// global $ methods for blocking/unblocking the entire page
+$.blockUI   = function(opts) { install(window, opts); };
+$.unblockUI = function(opts) { remove(window, opts); };
+
+// convenience method for quick growl-like notifications  (http://www.google.com/search?q=growl)
+$.growlUI = function(title, message, timeout, onClose) {
+	var $m = $('
    ');
+	if (title) $m.append('
    '+title+'
    ');
+	if (message) $m.append('
    '+message+'
    ');
+	if (timeout == undefined) timeout = 3000;
+	$.blockUI({
+		message: $m, fadeIn: 700, fadeOut: 1000, centerY: false,
+		timeout: timeout, showOverlay: false,
+		onUnblock: onClose, 
+		css: $.blockUI.defaults.growlCSS
+	});
+};
+
+// plugin method for blocking element content
+$.fn.block = function(opts) {
+	return this.unblock({ fadeOut: 0 }).each(function() {
+		if ($.css(this,'position') == 'static')
+			this.style.position = 'relative';
+		if ($.browser.msie)
+			this.style.zoom = 1; // force 'hasLayout'
+		install(this, opts);
+	});
+};
+
+// plugin method for unblocking element content
+$.fn.unblock = function(opts) {
+	return this.each(function() {
+		remove(this, opts);
+	});
+};
+
+$.blockUI.version = 2.39; // 2nd generation blocking at no extra cost!
+
+// override these in your code to change the default behavior and style
+$.blockUI.defaults = {
+	// message displayed when blocking (use null for no message)
+	message:  '
    Please wait...
    ',
+
+	title: null,	  // title string; only used when theme == true
+	draggable: true,  // only used when theme == true (requires jquery-ui.js to be loaded)
+	
+	theme: false, // set to true to use with jQuery UI themes
+	
+	// styles for the message when blocking; if you wish to disable
+	// these and use an external stylesheet then do this in your code:
+	// $.blockUI.defaults.css = {};
+	css: {
+		padding:	0,
+		margin:		0,
+		width:		'30%',
+		top:		'40%',
+		left:		'35%',
+		textAlign:	'center',
+		color:		'#000',
+		border:		'3px solid #aaa',
+		backgroundColor:'#fff',
+		cursor:		'wait'
+	},
+	
+	// minimal style set used when themes are used
+	themedCSS: {
+		width:	'30%',
+		top:	'40%',
+		left:	'35%'
+	},
+
+	// styles for the overlay
+	overlayCSS:  {
+		backgroundColor: '#000',
+		opacity:	  	 0.6,
+		cursor:		  	 'wait'
+	},
+
+	// styles applied when using $.growlUI
+	growlCSS: {
+		width:  	'350px',
+		top:		'10px',
+		left:   	'',
+		right:  	'10px',
+		border: 	'none',
+		padding:	'5px',
+		opacity:	0.6,
+		cursor: 	'default',
+		color:		'#fff',
+		backgroundColor: '#000',
+		'-webkit-border-radius': '10px',
+		'-moz-border-radius':	 '10px',
+		'border-radius': 		 '10px'
+	},
+	
+	// IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w
+	// (hat tip to Jorge H. N. de Vasconcelos)
+	iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank',
+
+	// force usage of iframe in non-IE browsers (handy for blocking applets)
+	forceIframe: false,
+
+	// z-index for the blocking overlay
+	baseZ: 1000,
+
+	// set these to true to have the message automatically centered
+	centerX: true, // <-- only effects element blocking (page block controlled via css above)
+	centerY: true,
+
+	// allow body element to be stetched in ie6; this makes blocking look better
+	// on "short" pages.  disable if you wish to prevent changes to the body height
+	allowBodyStretch: true,
+
+	// enable if you want key and mouse events to be disabled for content that is blocked
+	bindEvents: true,
+
+	// be default blockUI will supress tab navigation from leaving blocking content
+	// (if bindEvents is true)
+	constrainTabKey: true,
+
+	// fadeIn time in millis; set to 0 to disable fadeIn on block
+	fadeIn:  200,
+
+	// fadeOut time in millis; set to 0 to disable fadeOut on unblock
+	fadeOut:  400,
+
+	// time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock
+	timeout: 0,
+
+	// disable if you don't want to show the overlay
+	showOverlay: true,
+
+	// if true, focus will be placed in the first available input field when
+	// page blocking
+	focusInput: true,
+
+	// suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
+	applyPlatformOpacityRules: true,
+	
+	// callback method invoked when fadeIn has completed and blocking message is visible
+	onBlock: null,
+
+	// callback method invoked when unblocking has completed; the callback is
+	// passed the element that has been unblocked (which is the window object for page
+	// blocks) and the options that were passed to the unblock call:
+	//	 onUnblock(element, options)
+	onUnblock: null,
+
+	// don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493
+	quirksmodeOffsetHack: 4,
+
+	// class name of the message block
+	blockMsgClass: 'blockMsg'
+};
+
+// private data and functions follow...
+
+var pageBlock = null;
+var pageBlockEls = [];
+
+function install(el, opts) {
+	var full = (el == window);
+	var msg = opts && opts.message !== undefined ? opts.message : undefined;
+	opts = $.extend({}, $.blockUI.defaults, opts || {});
+	opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {});
+	var css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
+	var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {});
+	msg = msg === undefined ? opts.message : msg;
+
+	// remove the current block (if there is one)
+	if (full && pageBlock)
+		remove(window, {fadeOut:0});
+
+	// if an existing element is being used as the blocking content then we capture
+	// its current place in the DOM (and current display style) so we can restore
+	// it when we unblock
+	if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) {
+		var node = msg.jquery ? msg[0] : msg;
+		var data = {};
+		$(el).data('blockUI.history', data);
+		data.el = node;
+		data.parent = node.parentNode;
+		data.display = node.style.display;
+		data.position = node.style.position;
+		if (data.parent)
+			data.parent.removeChild(node);
+	}
+
+	$(el).data('blockUI.onUnblock', opts.onUnblock);
+	var z = opts.baseZ;
+
+	// blockUI uses 3 layers for blocking, for simplicity they are all used on every platform;
+	// layer1 is the iframe layer which is used to supress bleed through of underlying content
+	// layer2 is the overlay layer which has opacity and a wait cursor (by default)
+	// layer3 is the message content that is displayed while blocking
+
+	var lyr1 = ($.browser.msie || opts.forceIframe) 
+		? $('')
+		: $('');
+	
+	var lyr2 = opts.theme 
+	 	? $('')
+	 	: $('');
+
+	var lyr3, s;
+	if (opts.theme && full) {
+		s = '';
+	}
+	else if (opts.theme) {
+		s = '';
+	}
+	else if (full) {
+		s = '';
+	}			 
+	else {
+		s = '';
+	}
+	lyr3 = $(s);
+
+	// if we have a message, style it
+	if (msg) {
+		if (opts.theme) {
+			lyr3.css(themedCSS);
+			lyr3.addClass('ui-widget-content');
+		}
+		else 
+			lyr3.css(css);
+	}
+
+	// style the overlay
+	if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
+		lyr2.css(opts.overlayCSS);
+	lyr2.css('position', full ? 'fixed' : 'absolute');
+
+	// make iframe layer transparent in IE
+	if ($.browser.msie || opts.forceIframe)
+		lyr1.css('opacity',0.0);
+
+	//$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el);
+	var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el);
+	$.each(layers, function() {
+		this.appendTo($par);
+	});
+	
+	if (opts.theme && opts.draggable && $.fn.draggable) {
+		lyr3.draggable({
+			handle: '.ui-dialog-titlebar',
+			cancel: 'li'
+		});
+	}
+
+	// ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling)
+	var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0);
+	if (ie6 || expr) {
+		// give body 100% height
+		if (full && opts.allowBodyStretch && $.boxModel)
+			$('html,body').css('height','100%');
+
+		// fix ie6 issue when blocked element has a border width
+		if ((ie6 || !$.boxModel) && !full) {
+			var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth');
+			var fixT = t ? '(0 - '+t+')' : 0;
+			var fixL = l ? '(0 - '+l+')' : 0;
+		}
+
+		// simulate fixed position
+		$.each([lyr1,lyr2,lyr3], function(i,o) {
+			var s = o[0].style;
+			s.position = 'absolute';
+			if (i < 2) {
+				full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"')
+					 : s.setExpression('height','this.parentNode.offsetHeight + "px"');
+				full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"')
+					 : s.setExpression('width','this.parentNode.offsetWidth + "px"');
+				if (fixL) s.setExpression('left', fixL);
+				if (fixT) s.setExpression('top', fixT);
+			}
+			else if (opts.centerY) {
+				if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"');
+				s.marginTop = 0;
+			}
+			else if (!opts.centerY && full) {
+				var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0;
+				var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"';
+				s.setExpression('top',expression);
+			}
+		});
+	}
+
+	// show the message
+	if (msg) {
+		if (opts.theme)
+			lyr3.find('.ui-widget-content').append(msg);
+		else
+			lyr3.append(msg);
+		if (msg.jquery || msg.nodeType)
+			$(msg).show();
+	}
+
+	if (($.browser.msie || opts.forceIframe) && opts.showOverlay)
+		lyr1.show(); // opacity is zero
+	if (opts.fadeIn) {
+		var cb = opts.onBlock ? opts.onBlock : noOp;
+		var cb1 = (opts.showOverlay && !msg) ? cb : noOp;
+		var cb2 = msg ? cb : noOp;
+		if (opts.showOverlay)
+			lyr2._fadeIn(opts.fadeIn, cb1);
+		if (msg)
+			lyr3._fadeIn(opts.fadeIn, cb2);
+	}
+	else {
+		if (opts.showOverlay)
+			lyr2.show();
+		if (msg)
+			lyr3.show();
+		if (opts.onBlock)
+			opts.onBlock();
+	}
+
+	// bind key and mouse events
+	bind(1, el, opts);
+
+	if (full) {
+		pageBlock = lyr3[0];
+		pageBlockEls = $(':input:enabled:visible',pageBlock);
+		if (opts.focusInput)
+			setTimeout(focus, 20);
+	}
+	else
+		center(lyr3[0], opts.centerX, opts.centerY);
+
+	if (opts.timeout) {
+		// auto-unblock
+		var to = setTimeout(function() {
+			full ? $.unblockUI(opts) : $(el).unblock(opts);
+		}, opts.timeout);
+		$(el).data('blockUI.timeout', to);
+	}
+};
+
+// remove the block
+function remove(el, opts) {
+	var full = (el == window);
+	var $el = $(el);
+	var data = $el.data('blockUI.history');
+	var to = $el.data('blockUI.timeout');
+	if (to) {
+		clearTimeout(to);
+		$el.removeData('blockUI.timeout');
+	}
+	opts = $.extend({}, $.blockUI.defaults, opts || {});
+	bind(0, el, opts); // unbind events
+
+	if (opts.onUnblock === null) {
+		opts.onUnblock = $el.data('blockUI.onUnblock');
+		$el.removeData('blockUI.onUnblock');
+	}
+
+	var els;
+	if (full) // crazy selector to handle odd field errors in ie6/7
+		els = $('body').children().filter('.blockUI').add('body > .blockUI');
+	else
+		els = $('.blockUI', el);
+
+	if (full)
+		pageBlock = pageBlockEls = null;
+
+	if (opts.fadeOut) {
+		els.fadeOut(opts.fadeOut);
+		setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut);
+	}
+	else
+		reset(els, data, opts, el);
+};
+
+// move blocking element back into the DOM where it started
+function reset(els,data,opts,el) {
+	els.each(function(i,o) {
+		// remove via DOM calls so we don't lose event handlers
+		if (this.parentNode)
+			this.parentNode.removeChild(this);
+	});
+
+	if (data && data.el) {
+		data.el.style.display = data.display;
+		data.el.style.position = data.position;
+		if (data.parent)
+			data.parent.appendChild(data.el);
+		$(el).removeData('blockUI.history');
+	}
+
+	if (typeof opts.onUnblock == 'function')
+		opts.onUnblock(el,opts);
+};
+
+// bind/unbind the handler
+function bind(b, el, opts) {
+	var full = el == window, $el = $(el);
+
+	// don't bother unbinding if there is nothing to unbind
+	if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked')))
+		return;
+	if (!full)
+		$el.data('blockUI.isBlocked', b);
+
+	// don't bind events when overlay is not in use or if bindEvents is false
+	if (!opts.bindEvents || (b && !opts.showOverlay)) 
+		return;
+
+	// bind anchors and inputs for mouse and key events
+	var events = 'mousedown mouseup keydown keypress';
+	b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler);
+
+// former impl...
+//	   var $e = $('a,:input');
+//	   b ? $e.bind(events, opts, handler) : $e.unbind(events, handler);
+};
+
+// event handler to suppress keyboard/mouse events when blocking
+function handler(e) {
+	// allow tab navigation (conditionally)
+	if (e.keyCode && e.keyCode == 9) {
+		if (pageBlock && e.data.constrainTabKey) {
+			var els = pageBlockEls;
+			var fwd = !e.shiftKey && e.target === els[els.length-1];
+			var back = e.shiftKey && e.target === els[0];
+			if (fwd || back) {
+				setTimeout(function(){focus(back)},10);
+				return false;
+			}
+		}
+	}
+	var opts = e.data;
+	// allow events within the message content
+	if ($(e.target).parents('div.' + opts.blockMsgClass).length > 0)
+		return true;
+
+	// allow events for content that is not being blocked
+	return $(e.target).parents().children().filter('div.blockUI').length == 0;
+};
+
+function focus(back) {
+	if (!pageBlockEls)
+		return;
+	var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0];
+	if (e)
+		e.focus();
+};
+
+function center(el, x, y) {
+	var p = el.parentNode, s = el.style;
+	var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth');
+	var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth');
+	if (x) s.left = l > 0 ? (l+'px') : '0';
+	if (y) s.top  = t > 0 ? (t+'px') : '0';
+};
+
+function sz(el, p) {
+	return parseInt($.css(el,p))||0;
+};
+
+})(jQuery);
diff --git a/addons/base/static/lib/jquery.form/jquery.form.js b/addons/base/static/lib/jquery.form/jquery.form.js
new file mode 100644
index 00000000000..66ac5142238
--- /dev/null
+++ b/addons/base/static/lib/jquery.form/jquery.form.js
@@ -0,0 +1,911 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.83 (11-JUL-2011)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+	
+	var method, action, url, $form = this;
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	method = this.attr('method');
+	action = this.attr('action');
+	url = (typeof action === 'string') ? $.trim(action) : '';
+	url = url || window.location.href || '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: method || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, function() { fileUpload(a); });
+		}
+	   else {
+		   fileUpload(a);
+		}
+   }
+   else {
+		// IE7 massage (see issue 57)
+		if ($.browser.msie && method == 'get') { 
+			var ieMeth = $form[0].getAttribute('method');
+			if (typeof ieMeth === 'string')
+				options.type = ieMeth;
+		}
+		$.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload(a) {
+		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+        var useProp = !!$.fn.prop;
+
+        if (a) {
+        	// ensure that every serialized input is still enabled
+          	for (i=0; i < a.length; i++) {
+                el = $(form[a[i].name]);
+                el[ useProp ? 'prop' : 'attr' ]('disabled', false);
+          	}
+        }
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		id = 'jqFormIO' + (new Date().getTime());
+		if (s.iframeTarget) {
+			$io = $(s.iframeTarget);
+			n = $io.attr('name');
+			if (n == null)
+			 	$io.attr('name', id);
+			else
+				id = n;
+		}
+		else {
+			$io = $('