diff --git a/addons/account/account.py b/addons/account/account.py index e11479e4dc0..bfc16a4c419 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -111,7 +111,7 @@ class account_payment_term_line(osv.osv): 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \ "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."), 'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."), - 'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True), + 'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'), } _defaults = { 'value': 'balance', @@ -1375,7 +1375,7 @@ class account_move(osv.osv): balance = 0.0 for line in line_ids: if line[2]: - balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00) + balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00))) return {'value': {'balance': balance}} def write(self, cr, uid, ids, vals, context=None): diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 630c551c5ca..563c3f5fc6c 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -29,7 +29,6 @@
- diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index 02da9a6ab1f..9acc09e9026 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -30,9 +30,11 @@ class account_common_report(osv.osv_memory): _description = "Account Common Report" def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None): + res = {} if chart_account_id: company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id - return {'value': {'company_id': company_id}} + res['value'] = {'company_id': company_id} + return res _columns = { 'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]), diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po index 57d269be72d..c3b0b12b4b7 100644 --- a/addons/base_vat/i18n/es_MX.po +++ b/addons/base_vat/i18n/es_MX.po @@ -1,70 +1,54 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * base_vat +# Spanish (Mexico) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. # msgid "" 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-12-25 18:58+0000\n" -"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " -"\n" -"Language-Team: \n" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-09-07 00:31+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Mexico) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:10+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2012-09-07 04:57+0000\n" +"X-Generator: Launchpad (build 15914)\n" #. module: base_vat -#: code:addons/base_vat/base_vat.py:87 +#: code:addons/base_vat/base_vat.py:141 #, python-format msgid "" -"The Vat does not seems to be correct. You should have entered something like " -"this %s" -msgstr "" -"El CIF/NIF parece que no sea correcto. Debería haber introducido algo como " -"esto %s" +"This VAT number does not seem to be valid.\n" +"Note: the expected format is %s" +msgstr "El RFC no es válido. El formato esperado es %s" #. module: base_vat -#: model:ir.module.module,description:base_vat.module_meta_information -msgid "" -"\n" -" Enable the VAT Number for the partner. Check the validity of that VAT " -"Number.\n" -"\n" -" This module follows the methods stated at http://sima-pc.com/nif.php " -"for\n" -" checking the validity of VAT Number assigned to partners in European " -"countries.\n" -" " +#: sql_constraint:res.company:0 +msgid "The company name must be unique !" msgstr "" -"\n" -" Permite la validación del CIF/NIF de las empresas. Comprueba si el " -"CIF/NIF es un número válido.\n" -"\n" -" Este módulo usa los métodos especificados en http://sima-pc.com/nif.php " -"para\n" -" la validación del CIF/NIF asignado a las empresas de los países " -"europeos.\n" -" " - -#. module: base_vat -#: model:ir.module.module,shortdesc:base_vat.module_meta_information -msgid "Base VAT - To check VAT number validity" -msgstr "Base CIF/NIF - Para comprobar la validez de los CIF/NIF" #. module: base_vat #: constraint:res.partner:0 -msgid "Error ! You can not create recursive associated members." -msgstr "¡Error! No puede crear miembros asociados recursivos." +msgid "Error ! You cannot create recursive associated members." +msgstr "" #. module: base_vat -#: code:addons/base_vat/base_vat.py:88 -#, python-format -msgid "The VAT is invalid, It should begin with the country code" -msgstr "El CIF/NIF no es válido, debería empezar con el código del país" +#: field:res.company,vat_check_vies:0 +msgid "VIES VAT Check" +msgstr "" + +#. module: base_vat +#: model:ir.model,name:base_vat.model_res_company +msgid "Companies" +msgstr "" + +#. module: base_vat +#: constraint:res.company:0 +msgid "Error! You can not create recursive companies." +msgstr "" #. module: base_vat #: help:res.partner,vat_subjected:0 @@ -72,27 +56,20 @@ msgid "" "Check this box if the partner is subjected to the VAT. It will be used for " "the VAT legal statement." msgstr "" -"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la " -"declaración legal del IVA." #. module: base_vat #: model:ir.model,name:base_vat.model_res_partner msgid "Partner" -msgstr "Empresa" +msgstr "" + +#. module: base_vat +#: help:res.company,vat_check_vies:0 +msgid "" +"If checked, Partners VAT numbers will be fully validated against EU's VIES " +"service rather than via a simple format validation (checksum)." +msgstr "" #. module: base_vat #: field:res.partner,vat_subjected:0 msgid "VAT Legal Statement" -msgstr "Sujeto a IVA" - -#~ msgid "Invalid XML for View Architecture!" -#~ msgstr "¡XML inválido para la definición de la vista!" - -#~ msgid "" -#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number." -#~ msgstr "" -#~ "Activa el IVA (Impuesto Valor Añadido) para la empresa. Comprueba la validez " -#~ "del CIF/NIF." - -#~ msgid "VAT" -#~ msgstr "IVA" +msgstr "" diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py index f07878717fd..2690012f3b4 100644 --- a/addons/board/__openerp__.py +++ b/addons/board/__openerp__.py @@ -28,9 +28,7 @@ Lets the user create a custom dashboard. ======================================== -This module also creates the Administration Dashboard. - -The user can also publish notes. +Allows users to create custom dashboard. """, 'author': 'OpenERP SA', 'depends': ['base'], diff --git a/addons/board/i18n/nb.po b/addons/board/i18n/nb.po new file mode 100644 index 00000000000..2d759af27d1 --- /dev/null +++ b/addons/board/i18n/nb.po @@ -0,0 +1,348 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-09-06 14:01+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n" +"X-Generator: Launchpad (build 15914)\n" + +#. module: board +#: view:res.log.report:0 +msgid " Year " +msgstr " År " + +#. module: board +#: model:ir.model,name:board.model_board_menu_create +msgid "Menu Create" +msgstr "Meny laget" + +#. module: board +#: view:board.menu.create:0 +msgid "Menu Information" +msgstr "Meny informasjon" + +#. module: board +#: view:res.users:0 +msgid "Latest Connections" +msgstr "Siste Tilkoblinger" + +#. module: board +#: view:res.log.report:0 +msgid "Log created in last month" +msgstr "Logg opprettet i forrige måned" + +#. module: board +#: view:board.board:0 +#: model:ir.actions.act_window,name:board.open_board_administration_form +msgid "Administration Dashboard" +msgstr "Administrasjon kontrollpanel" + +#. module: board +#: view:res.log.report:0 +msgid "Group By..." +msgstr "Grupper etter ..." + +#. module: board +#: view:res.log.report:0 +msgid "Log created in current year" +msgstr "Logg opprettet i gjeldende år." + +#. module: board +#: model:ir.model,name:board.model_board_board +msgid "Board" +msgstr "Brett" + +#. module: board +#: field:board.menu.create,menu_name:0 +msgid "Menu Name" +msgstr "Menynavn" + +#. module: board +#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action +#: view:res.log.report:0 +msgid "Weekly Global Activity" +msgstr "Ukentlig global aktivitet" + +#. module: board +#: field:board.board.line,name:0 +msgid "Title" +msgstr "Tittel" + +#. module: board +#: field:res.log.report,nbr:0 +msgid "# of Entries" +msgstr "# av oppføringer" + +#. module: board +#: view:res.log.report:0 +#: field:res.log.report,month:0 +msgid "Month" +msgstr "Måned" + +#. module: board +#: view:res.log.report:0 +msgid "Log created in current month" +msgstr "Logg opprettet i gjeldende måned." + +#. module: board +#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action +#: view:res.log.report:0 +msgid "Monthly Activity per Document" +msgstr "Månedlig aktivitet per dokument" + +#. module: board +#: view:board.board:0 +msgid "Configuration Overview" +msgstr "Konfigurasjonsoversikt" + +#. module: board +#: model:ir.actions.act_window,name:board.action_view_board_list_form +#: model:ir.ui.menu,name:board.menu_view_board_form +msgid "Dashboard Definition" +msgstr "Kontrollpanel Definisjon" + +#. module: board +#: selection:res.log.report,month:0 +msgid "March" +msgstr "Mars" + +#. module: board +#: selection:res.log.report,month:0 +msgid "August" +msgstr "August" + +#. module: board +#: model:ir.actions.act_window,name:board.action_user_connection_tree +msgid "User Connections" +msgstr "Brukertilkoblinger" + +#. module: board +#: field:res.log.report,creation_date:0 +msgid "Creation Date" +msgstr "Opprettelsesdato" + +#. module: board +#: view:res.log.report:0 +msgid "Log Analysis" +msgstr "Logg analyse" + +#. module: board +#: field:res.log.report,res_model:0 +msgid "Object" +msgstr "Objekt" + +#. module: board +#: selection:res.log.report,month:0 +msgid "June" +msgstr "Juni" + +#. module: board +#: field:board.board,line_ids:0 +msgid "Action Views" +msgstr "Handling Visninger" + +#. module: board +#: model:ir.model,name:board.model_res_log_report +msgid "Log Report" +msgstr "Logg rapport" + +#. module: board +#: code:addons/board/wizard/board_menu_create.py:46 +#, python-format +msgid "Please Insert Dashboard View(s) !" +msgstr "Vennligst Sett Kontrollpanel Vinsning (er)!" + +#. module: board +#: selection:res.log.report,month:0 +msgid "July" +msgstr "juli" + +#. module: board +#: view:res.log.report:0 +#: field:res.log.report,day:0 +msgid "Day" +msgstr "Dag" + +#. module: board +#: view:board.menu.create:0 +msgid "Create Menu For Dashboard" +msgstr "Opprett meny for Kontrollpanel." + +#. module: board +#: selection:res.log.report,month:0 +msgid "February" +msgstr "Februar" + +#. module: board +#: selection:res.log.report,month:0 +msgid "October" +msgstr "Oktober" + +#. module: board +#: model:ir.model,name:board.model_board_board_line +msgid "Board Line" +msgstr "bord Linje" + +#. module: board +#: field:board.menu.create,menu_parent_id:0 +msgid "Parent Menu" +msgstr "Overordnet meny" + +#. module: board +#: view:res.log.report:0 +msgid " Month-1 " +msgstr " Måned-1 " + +#. module: board +#: selection:res.log.report,month:0 +msgid "January" +msgstr "Januar" + +#. module: board +#: view:board.board:0 +msgid "Users" +msgstr "Brukere" + +#. module: board +#: selection:res.log.report,month:0 +msgid "November" +msgstr "November" + +#. module: board +#: help:board.board.line,sequence:0 +msgid "" +"Gives the sequence order when displaying a list of " +"board lines." +msgstr "Gir rekkefølgen av når du viser en liste over bord linjer." + +#. module: board +#: selection:res.log.report,month:0 +msgid "April" +msgstr "April" + +#. module: board +#: view:board.board:0 +#: field:board.board,name:0 +#: field:board.board.line,board_id:0 +#: model:ir.ui.menu,name:board.menu_dasboard +msgid "Dashboard" +msgstr "Kontrollpanel" + +#. module: board +#: code:addons/board/wizard/board_menu_create.py:45 +#, python-format +msgid "User Error!" +msgstr "Bruker feil!" + +#. module: board +#: field:board.board.line,action_id:0 +msgid "Action" +msgstr "Handling" + +#. module: board +#: field:board.board.line,position:0 +msgid "Position" +msgstr "Posisjon" + +#. module: board +#: view:res.log.report:0 +msgid "Model" +msgstr "Modell" + +#. module: board +#: model:ir.actions.act_window,name:board.board_homepage_action +msgid "Home Page" +msgstr "Hjemmeside" + +#. module: board +#: model:ir.actions.act_window,name:board.action_latest_activities_tree +msgid "Latest Activities" +msgstr "Senest aktiveter" + +#. module: board +#: selection:board.board.line,position:0 +msgid "Left" +msgstr "Venstre" + +#. module: board +#: field:board.board,view_id:0 +msgid "Board View" +msgstr "Bord visning" + +#. module: board +#: selection:board.board.line,position:0 +msgid "Right" +msgstr "Høyre" + +#. module: board +#: field:board.board.line,width:0 +msgid "Width" +msgstr "Bredde" + +#. module: board +#: view:res.log.report:0 +msgid " Month " +msgstr " Måned " + +#. module: board +#: field:board.board.line,sequence:0 +msgid "Sequence" +msgstr "Sekvens" + +#. module: board +#: selection:res.log.report,month:0 +msgid "September" +msgstr "September" + +#. module: board +#: selection:res.log.report,month:0 +msgid "December" +msgstr "Desember" + +#. module: board +#: view:board.board:0 +#: view:board.menu.create:0 +msgid "Create Menu" +msgstr "Opprett meny" + +#. module: board +#: field:board.board.line,height:0 +msgid "Height" +msgstr "Høyde" + +#. module: board +#: model:ir.actions.act_window,name:board.action_board_menu_create +msgid "Create Board Menu" +msgstr "Opprett bord meny" + +#. module: board +#: selection:res.log.report,month:0 +msgid "May" +msgstr "Mai" + +#. module: board +#: view:res.log.report:0 +#: field:res.log.report,name:0 +msgid "Year" +msgstr "År" + +#. module: board +#: view:board.menu.create:0 +msgid "Cancel" +msgstr "Kanseller" + +#. module: board +#: view:board.board:0 +msgid "Dashboard View" +msgstr "Kontrollpanel visning" diff --git a/addons/board/static/src/css/Makefile b/addons/board/static/src/css/Makefile new file mode 100644 index 00000000000..0cb5ae70f4a --- /dev/null +++ b/addons/board/static/src/css/Makefile @@ -0,0 +1,3 @@ +dashboard.css: dashboard.sass + sass --trace -t expanded dashboard.sass dashboard.css + diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css index 6907b4271a0..38e224daf42 100644 --- a/addons/board/static/src/css/dashboard.css +++ b/addons/board/static/src/css/dashboard.css @@ -5,6 +5,11 @@ .openerp .oe_dashboard { width: 100%; } +.openerp .oe_dashboard .oe_dashboard_layout_selector ul, .openerp .oe_dashboard .oe_dashboard_layout_selector li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_dashboard .oe_action { margin: 0 8px 8px 0; background-color: white; diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass index 4bacc7bd892..1bfc01a3809 100644 --- a/addons/board/static/src/css/dashboard.sass +++ b/addons/board/static/src/css/dashboard.sass @@ -14,6 +14,11 @@ margin: 0 4px 6px 0 .oe_dashboard width: 100% + .oe_dashboard_layout_selector + ul, li + margin: 0 + padding: 0 + list-style-type: none .oe_action margin: 0 8px 8px 0 background-color: white diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml index 3cd7090f1e0..b2363cafd53 100644 --- a/addons/board/static/src/xml/board.xml +++ b/addons/board/static/src/xml/board.xml @@ -36,7 +36,7 @@ -
+

Choose dashboard layout

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 16ed1e4c5ad..d80183b80c9 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -2,22 +2,6 @@ - - My Opportunities - crm.lead - tree - [('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))] - - - - - New Leads - crm.lead - tree - [('user_id','=',uid),('state','=','draft'),('type','=','lead')] - - - Opportunities By Stage - Graph crm.lead.report @@ -70,11 +54,9 @@ - - + - diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 881c0ace3cc..ddfdb05ca66 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -87,8 +87,8 @@ class crm_lead(base_stage, osv.osv): search_domain = [] section_id = self._resolve_section_id_from_context(cr, uid, context=context) if section_id: - search_domain += ['|', '&', ('section_ids', '=', section_id), ('fold', '=', False)] - search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)] + search_domain += ['|', ('section_ids', '=', section_id)] + search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)] # retrieve type from the context (if set: choose 'type' or 'both') type = self._resolve_type_from_context(cr, uid, context=context) if type: @@ -98,7 +98,12 @@ class crm_lead(base_stage, osv.osv): result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context) # restore order of the search result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0]))) - return result + + fold = {} + for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context): + fold[stage.id] = stage.fold or False + + return result, fold _group_by_full = { 'stage_id': _read_group_stage_ids @@ -200,7 +205,7 @@ class crm_lead(base_stage, osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), 'stage_id': fields.many2one('crm.case.stage', 'Stage', - domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"), + domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"), 'user_id': fields.many2one('res.users', 'Salesperson'), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml index 04f91933f66..f734a839ff4 100644 --- a/addons/crm/crm_lead_data.xml +++ b/addons/crm/crm_lead_data.xml @@ -55,7 +55,7 @@ Dead - + cancel diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index f763f0a598a..3546d641184 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -257,7 +257,7 @@ - + @@ -297,17 +297,9 @@ - -
    -
  • Phone:
    • -
  • Probability: %%
    • -
  • Creation date:
    • -
  • Date Deadline:
    • -
-
-
+
í