diff --git a/addons/account/account.py b/addons/account/account.py
index c9dd1950347..cfba30856a9 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -541,10 +541,18 @@ class account_account(osv.osv):
return False
return True
+ def _check_company_account(self, cr, uid, ids, context=None):
+ for account in self.browse(cr, uid, ids, context=context):
+ if account.parent_id:
+ if account.company_id != account.parent_id.company_id:
+ return False
+ return True
+
_constraints = [
(_check_recursion, 'Error!\nYou cannot create recursive accounts.', ['parent_id']),
(_check_type, 'Configuration Error!\nYou cannot define children to an account with internal type different of "View".', ['type']),
(_check_account_type, 'Configuration Error!\nYou cannot select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable".', ['user_type','type']),
+ (_check_company_account, 'Error!\nYou cannot create an account which has parent account of different company.', ['parent_id']),
]
_sql_constraints = [
('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index b01fc974bef..b37118c3baa 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -983,13 +983,13 @@ class account_invoice(osv.osv):
for i in line:
i[2]['period_id'] = period_id
+ ctx.update(invoice=inv)
move_id = move_obj.create(cr, uid, move, context=ctx)
new_move_name = move_obj.browse(cr, uid, move_id, context=ctx).name
# make the invoice point to that move
self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name}, context=ctx)
# Pass invoice in context in method post: used if you want to get the same
# account move reference when creating the same invoice after a cancelled one:
- ctx.update({'invoice':inv})
move_obj.post(cr, uid, [move_id], context=ctx)
self._log_event(cr, uid, ids)
return True
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2f722d07aeb..4feb97c2f5f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -168,10 +168,8 @@
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/>
\n" +" Click to add a personal note.\n" +"
\n" +" Use notes to organize personal tasks or notes. All\n" +" notes are private; no one else will be able to see them. " +"However\n" +" you can share some notes with other people by inviting " +"followers\n" +" on the note. (Useful for meeting minutes, especially if\n" +" you activate the pad feature for collaborative writings).\n" +"
\n" +" You can customize how you process your notes/tasks by adding,\n" +" removing or modifying columns.\n" +"
\n" +" " +msgstr "" +"\n" +" Klik om een persoonlijke notitie toe te voegen.\n" +"
\n" +" Gebruik notities om uw persoonlijke taken en notities te " +"organiseren. Alle\n" +" notities zijn prive; niemand anders kan deze notities zien. " +"Echter is het wel \n" +" mogenlijk om sommige notities te delen met andere gebruikers, " +"door deze uit te nodigen\n" +" op een notitie. (Dit is handig voor bijvoorbeeld een " +"gespreksverslag, en zeker als je\n" +" de pad mogelijkheid activeert voor het samenwerken)\n" +"
\n" +" U kunt het proces van notities en taken aanpassen door het " +"toevoegen,\n" +" verwijderen of aanpassen van kolommen.\n" +"
\n" +" " + +#. module: note +#: view:note.note:0 +msgid "kanban note" +msgstr "kanban notitie" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_01 +#: model:note.stage,name:note.note_stage_01 +msgid "Today" +msgstr "Vandaag" + +#. module: note +#: model:ir.model,name:note.model_res_users +msgid "Users" +msgstr "Gebruikers" + +#. module: note +#: view:note.note:0 +msgid "í" +msgstr "í" + +#. module: note +#: view:note.stage:0 +msgid "Stage of Notes" +msgstr "Notitie fases" + +#. module: note +#: field:note.note,message_unread:0 +msgid "Unread Messages" +msgstr "Ongelezen berichten" + +#. module: note +#: field:note.note,current_partner_id:0 +msgid "unknown" +msgstr "onbekend" + +#. module: note +#: view:note.note:0 +msgid "By sticky note Category" +msgstr "Notitie categorie" + +#. module: note +#: help:note.note,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen." + +#. module: note +#: field:note.stage,name:0 +msgid "Stage Name" +msgstr "Naam fase" + +#. module: note +#: field:note.note,message_is_follower:0 +msgid "Is a Follower" +msgstr "Is een volger" + +#. module: note +#: view:note.note:0 +msgid "title" +msgstr "titel" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_02 +#: model:note.stage,name:note.note_stage_02 +msgid "Tomorrow" +msgstr "Morgen" + +#. module: note +#: view:note.note:0 +#: field:note.note,open:0 +msgid "Active" +msgstr "Actief" + +#. module: note +#: help:note.stage,user_id:0 +msgid "Owner of the note stage." +msgstr "Eigenaar van de berichten fase" + +#. module: note +#: model:ir.ui.menu,name:note.menu_notes_stage +msgid "Categories" +msgstr "Categorieën" + +#. module: note +#: field:note.note,message_comment_ids:0 +#: help:note.note,message_comment_ids:0 +msgid "Comments and emails" +msgstr "Opmerkingen en e-mails." + +#. module: note +#: field:note.tag,name:0 +msgid "Tag Name" +msgstr "Label naam" + +#. module: note +#: field:note.note,message_ids:0 +msgid "Messages" +msgstr "Berichten" + +#. module: note +#: view:base.config.settings:0 +#: model:ir.actions.act_window,name:note.action_note_note +#: model:ir.ui.menu,name:note.menu_note_notes +#: view:note.note:0 +#: model:note.stage,name:note.note_stage_04 +msgid "Notes" +msgstr "Notities" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_03 +#: model:note.stage,name:note.note_stage_03 +msgid "Later" +msgstr "Later" + +#. module: note +#: model:ir.model,name:note.model_note_stage +msgid "Note Stage" +msgstr "Notitie fase" + +#. module: note +#: view:note.note:0 +msgid "dropdown menu" +msgstr "keuze menu" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_04 +msgid "Morning" +msgstr "Ochtend" + +#. module: note +#: help:note.stage,sequence:0 +msgid "Used to order the note stages" +msgstr "Wordt gebruikt om de notitie fases te sorteren" + +#. module: note +#: view:note.note:0 +msgid "W" +msgstr "W" + +#. module: note +#: field:note.note,stage_ids:0 +msgid "Stages of Users" +msgstr "Gebrukers fases" + +#. module: note +#: field:note.note,name:0 +msgid "Note Summary" +msgstr "Notitie samenvatting" + +#. module: note +#: model:ir.actions.act_window,name:note.action_note_stage +#: view:note.note:0 +msgid "Stages" +msgstr "Fases" + +#. module: note +#: help:note.note,message_ids:0 +msgid "Messages and communication history" +msgstr "Berichten en communicatie historie" + +#. module: note +#: view:note.note:0 +msgid "Delete" +msgstr "Verwijderen" + +#. module: note +#: field:note.note,color:0 +msgid "Color Index" +msgstr "Kleur index" + +#. module: note +#: field:note.note,sequence:0 +#: field:note.stage,sequence:0 +msgid "Sequence" +msgstr "Reeks" + +#. module: note +#: field:note.note,tag_ids:0 +msgid "Tags" +msgstr "Labels" + +#. module: note +#: view:note.note:0 +msgid "Archive" +msgstr "Archief" + +#. module: note +#: field:base.config.settings,module_note_pad:0 +msgid "Use collaborative pads (etherpad)" +msgstr "Gebruik collaboratieve pads (etherpad)" + +#. module: note +#: help:note.note,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" +"Bevat de samenvatting van de chatter (aantal berichten,...). Deze " +"samenvatting is direct in html formaat om zo in de kanban weergave te worden " +"ingevoegd." + +#. module: note +#: field:base.config.settings,group_note_fancy:0 +msgid "Use fancy layouts for notes" +msgstr "Gebruik luxe layouts voor notities" + +#. module: note +#: field:note.stage,user_id:0 +msgid "Owner" +msgstr "Eigenaar" + +#. module: note +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "Het gekozen bedrijf is niet toegestaan voor deze gebruiker" + +#. module: note +#: view:note.note:0 +#: field:note.note,stage_id:0 +msgid "Stage" +msgstr "Fase" + +#. module: note +#: field:note.note,date_done:0 +msgid "Date done" +msgstr "Datum verwerkt" + +#. module: note +#: field:note.stage,fold:0 +msgid "Folded by Default" +msgstr "Standaard ingevouwen" diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css index 1b7e9315e74..16d71e28aa5 100644 --- a/addons/note/static/src/css/note.css +++ b/addons/note/static/src/css/note.css @@ -49,8 +49,8 @@ padding: 8px; margin-left: 3px; margin-right: 3px; - padding-bottom: 16px; - margin-bottom: 16px; + padding-bottom: 8px; + margin-bottom: 10px; -webkit-transform: rotate(-2deg); -o-transform: rotate(-2deg); -moz-transform: rotate(-2deg); diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass index b5bc28a2593..6f0c0883ae7 100644 --- a/addons/note/static/src/css/note.sass +++ b/addons/note/static/src/css/note.sass @@ -53,8 +53,8 @@ padding: 8px margin-left: 3px margin-right: 3px - padding-bottom: 16px - margin-bottom: 16px + padding-bottom: 8px + margin-bottom: 10px @include rotate(-2deg) @include transition(all, 300ms) .oe_kanban_record:nth-of-type(even) diff --git a/addons/pad/pad.py b/addons/pad/pad.py index e5b36e5f64c..932fc5a21a4 100644 --- a/addons/pad/pad.py +++ b/addons/pad/pad.py @@ -19,7 +19,7 @@ class pad_common(osv.osv_memory): pad = { "server" : company.pad_server, - "key" : company.pad_key or "4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l", + "key" : company.pad_key, } # make sure pad server in the form of http://hostname diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml index 407f90e8242..99c4b38481c 100644 --- a/addons/pad/pad_demo.xml +++ b/addons/pad/pad_demo.xml @@ -1,9 +1,13 @@Click on the link above to download the installer for either 32 or 64 bits, and execute it.
System requirements:
-Thunderbird plugin installation:
-Thunderbird plug-in installation:
++ Click to register a new claim. +
+ You can track your claims from this menu and the action we + will take. +
+