odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged with addons/trunk, because of the mail_thread widget renaming. 

bzr revid: tde@openerp.com-20120703122104-pl5qn39hte3ui71p
bzr revid: tde@openerp.com-20120703142103-mfssnvtoqx5jn4df
This commit is contained in:
Thibault Delavallée 2012-07-03 16:21:03 +02:00
parent 289dad87d4 b6789d15e3
commit 2f3256d325
37 changed files with 10827 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account/account_installer.xml
View File

@ -13,8 +13,7 @@
<attribute name="string">Continue</attribute>
</button>
<separator string="title" position="replace">
<group string="Select an Accounting Setup">
<label colspan="2" string="This will automatically configure your taxes and accounts."/>
<group>
<field name="charts"/>
</group>
<group string="Configure your Fiscal Year" groups="account.group_account_user">

3
addons/account/account_view.xml
View File

@ -2357,12 +2357,11 @@
<group string="res_config_contents" position="replace">
<field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
<p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
<div groups="base.group_multi_company">
<label for="company_id"/>
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</div>
<group string="Set Your Accounting Options">
<group>
<div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<label for="chart_template_id"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>

10387
addons/account/i18n/es_DO.po Normal file
View File

File diff suppressed because it is too large Load Diff

2
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
View File

@ -77,7 +77,7 @@
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner"
sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
</data>

2
addons/account_voucher/account_voucher_view.xml
View File

@ -112,7 +112,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

4
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -258,7 +258,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -431,7 +431,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

4
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -168,7 +168,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>
@ -321,7 +321,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

2
addons/analytic/analytic_view.xml
View File

@ -44,7 +44,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

10
addons/base_action_rule/i18n/nl.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:05+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-02 15:02+0000\n"
"Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
"X-Generator: Launchpad (build 15505)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@ -337,7 +337,7 @@ msgstr "Actief"
#: code:addons/base_action_rule/base_action_rule.py:329
#, python-format
msgid "No Email ID Found for your Company address!"
msgstr ""
msgstr "Geen e-mail id gevonden voor uw bedrijfsadres!"
#. module: base_action_rule
#: field:base.action.rule,act_remind_user:0

4
addons/base_calendar/base_calendar_view.xml
View File

@ -45,10 +45,10 @@
</group>
</group>
<group>
<group string="Delegrated From">
<group string="Delegated From">
<field name="parent_ids" readonly="1" nolabel="1" />
</group>
<group string="Delegrated To" >
<group string="Delegated To" >
<field name="child_ids" readonly="1" nolabel="1" />
</group>
</group>

61
addons/caldav/wizard/caldav_browse_view.xml
View File

@ -7,13 +7,36 @@
<field name="model">caldav.browse</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Browse Caldav" >
<group colspan="4" width="700" height="500">
<separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="4" />
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" nolabel="1"/>
</group>
<form string="Browse Caldav" version="7.0">
<header>
<button special="cancel" string="_Close" icon="gtk-close"/>
</header>
<sheet>
<group>
<separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="2" />
<separator string="Help" colspan="4"/>
<group colspan="4"><div>
1. Webdav server that provides remote access to calendar<br/>
2. Synchronisation of calendar using WebDAV<br/>
3. Customize calendar event and todo attribute with any of OpenERP model<br/>
4. Provides iCal Import/Export functionality
<br/></div></group>
<group colspan="4"><div>
To access Calendars using CalDAV clients, point them to:
http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/calendars/users/<i>USERNAME</i>/c</div></group>
<group colspan="4"><div>
To access OpenERP Calendar using WebCal to remote site use the URL like:
http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/Calendars/<i>CALENDAR_NAME</i>.ics</div></group>
<group colspan="4"><div>
<i>
HOSTNAME: Host on which OpenERP server(With webdav) is running<br/>
PORT : Port on which OpenERP server is running (By Default : 8069)<br/>
DATABASE_NAME: Name of database on which OpenERP Calendar is created</i>
</div></group>
</group>
</sheet>
</form>
</field>
</record>
@ -29,12 +52,11 @@
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Configure your openerp hostname. For example : " colspan="4"></label>
<newline/>
<label string="database.my.openerp.com or companyserver.com" colspan="4"/>
<newline/>
<separator colspan="4"/>
<field name="host_name" colspan="4" width="250" />
<sheet>
<group>
<field name="host_name" colspan="2" width="250" placeholder="For example : database.my.openerp.com or companyserver.com"/>
</group>
</sheet>
</form>
</field>
</record>
@ -50,11 +72,14 @@
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="" colspan="4"/>
<field name="service" colspan="4" width="250" readonly="1"/>
<field name="collection" colspan="4" width="250" invisible="1" />
<field name="calendar" colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device" colspan="4" width="250" />
<sheet>
<group>
<field name="service" readonly="1"/>
<field name="collection" invisible="1" />
<field name="calendar" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device"/>
</group>
</sheet>
</form>
</field>
</record>

14
addons/crm/crm_lead_view.xml
View File

@ -171,10 +171,13 @@
</div>
</group>
<group>
<field name="contact_name" />
<label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
</div>
<field name="email_from" widget="email"/>
<field name="function" />
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="phone"/>
<field name="mobile"/>
<field name="fax"/>
@ -531,9 +534,12 @@
</group>
<group>
<field name="contact_name" />
<label for="contact_name" />
<div>
<field name="contact_name" class="oe_inline"/>,
<field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
</div>
<field name="function" />
<field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="mobile"/>
<field name="fax"/>
</group>

2
addons/crm/crm_meeting_menu.xml
View File

@ -83,7 +83,7 @@
<menuitem name="Meetings" id="menu_crm_case_categ_meet"
action="crm_case_categ_meet" parent="base.menu_sales"
sequence="7" />
sequence="8" />
<record id="action_view_attendee_form" model="ir.actions.act_window">
<field name="name">Meeting Invitations</field>

36
addons/crm/crm_meeting_view.xml
View File

@ -84,24 +84,26 @@
<h1>
<field name="name"/>
</h1>
<h2>
At <field name="location" class="oe_inline" />
</h2>
</div>
<h2>
<label for="duration" string="Duration" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)"
class="oe_inline"/> from
<field name="date"
string="Start Date"
required="1"
class="oe_edit_only oe_inline"/> to
<field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_inline"/>
</h2>
<group>
<h2>
<label for="date" string="Starting at"/>
<field name="date" required="1" class="oe_inline"/>
<label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Specify the location here" class="oe_inline"/>
</h2>
</group>
<group>
<h2>
<label for="duration" string="Duration" />
<field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)"
class="oe_inline"/> (
<field name="date_deadline"
string="End Date" required="1"
on_change="onchange_dates(date,False,date_deadline)"
class="oe_inline"/> )
</h2>
</group>
<group colspan="4" col="4">
<group colspan="2">
<field name="user_id" />

13
addons/crm/crm_view.xml
View File

@ -81,11 +81,16 @@
<notebook colspan="4">
<page string="Sales Team">
<group col="4">
<field name="reply_to"/>
<field name="allow_unlink"/>
<field name="change_responsible"/>
<field name="member_ids"/>
<group>
<field name="reply_to"/>
</group>
<group>
<field name="change_responsible"/>
<field name="allow_unlink"/>
</group>
</group>
<separator string="Team Members"/>
<field name="member_ids"/>
</page>
<page string="Stages">
<separator string="Select Stages for this Sales Team"/>

89
addons/crm/res_partner_view.xml
View File

@ -45,25 +45,57 @@
</field>
</record>
<act_window
id="crm_meeting_partner"
name="Meetings"
res_model="crm.meeting"
src_model="res.partner"
view_mode="calendar,tree,form,gantt"
context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
/>
<act_window
id="act_res_partner_2_opportunity"
name="Opportunities"
res_model="crm.lead"
src_model="res.partner"
view_mode="kanban,tree,form,graph,calendar"
domain="[('type','=','opportunity')]"
context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
/>
<!-- open meetings related to given partner -->
<record id="crm_meeting_partner" model="ir.actions.act_window">
<field name="name">Meetings</field>
<field name="src_model">res.partner</field>
<field name="res_model">crm.meeting</field>
<field name="view_mode">calendar,tree,form,gantt</field>
<field name="context">{'search_default_partner_id': active_id}</field>
</record>
<!-- Partner kanban view inherte -->
<!-- open opportunities related to given partner -->
<record model="ir.actions.act_window" id="relate_partner_opportunities">
<field name="name">Opportunities</field>
<field name="res_model">crm.lead</field>
<field name="view_mode">kanban,tree,form,graph,calendar</field>
<field name="domain">[('type','=','opportunity')]</field>
<field name="context">{'search_default_partner_id': active_id,
'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help">
With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
</field>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_kanban">
<field name="sequence" eval="0"/>
<field name="view_mode">kanban</field>
<field name="view_id" ref="crm_case_kanban_view_leads"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
<field name="sequence" eval="4"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_case_graph_view_opportunity"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
<!-- Partner kanban view inherte -->
<record model="ir.ui.view" id="crm_lead_partner_kanban_view">
<field name="name">res.partner.kanban.inherit</field>
<field name="model">res.partner</field>
@ -74,13 +106,13 @@
<field name="opportunity_count"/>
<field name="meeting_count"/>
</field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(act_res_partner_2_opportunity)d" type="action">
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
</a>
<a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
</a>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(relate_partner_opportunities)d" type="action">
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
</a>
<a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
</a>
</xpath>
</field>
</record>
@ -96,13 +128,12 @@
<button type="action"
string="Schedule a Meeting"
name="%(crm.crm_case_categ_meet_create_partner)d"
context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" />
context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
<button type="action" string="Opportunities"
context="{'search_default_partner_id': [active_id]}"
name="%(crm.action_view_crm_partner2opportunity)d" />
name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
</xpath>
</field>
</record>

3
addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
View File

@ -17,15 +17,12 @@
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<separator string="Schedule/Log a Call" colspan="4"/>
<field name="action"/>
<separator string="Call Details" colspan="4"/>
<field name="name"/>
<field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
<field name="partner_id" readonly="True"/>
<field name="user_id" />
<field name="section_id"/>
<field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
</group>
</form>
</field>

2
addons/crm_caldav/crm_caldav_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<record id="action_caldav_browse" model="ir.actions.act_window">
<field name="name">Caldav Browse</field>
<field name="name">Synchronize Your Meetings</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">user.preference</field>
<field name="view_id" ref="caldav.host_prefernce_form"/>

4
addons/crm_claim/crm_claim_view.xml
View File

@ -168,9 +168,9 @@
</notebook>
</group>
</sheet>
<div class="oe_sheet_width">
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</footer>
</form>
</field>
</record>

32
addons/crm_fundraising/crm_fundraising_view.xml
View File

@ -72,38 +72,48 @@
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet string="Funds Form">
<group col="4">
<field name="name" string="Name"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="user_id" string="Responsible"/>
<field name="date"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
<field name="type_id" string="Payment Mode" widget="selection"/>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
<label for="categ_id" class="oe_edit_only"/>
<h2>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]" class="oe_inline"/>
</h2>
<group>
<group>
<field name="user_id" string="Responsible"/>
<field name="section_id" colspan="1" widget="selection"/>
</group>
<group>
<field name="date"/>
<field name="type_id" string="Payment Mode" widget="selection"/>
<field name="priority" string="Priority"/>
</group>
</group>
<notebook>
<page string="Funds">
<group>
<group string="Communication">
<group>
<field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)"
/>
<field name="email_from"/>
</group>
<group string="Estimates">
<group>
<field name="planned_cost"/>
<field name="planned_revenue"/>
<field name="probability"/>
</group>
</group>
<separator colspan="4" string="Notes"/>
<field name="description"/>
<field name="description" placeholder="Add a note..."/>
</page>
<page string="Extra Info">
<group>
<group string="Misc">
<field name="active"/>
<field name="id"/>
<field name="priority" string="Priority"/>
</group>
<group groups="base.group_no_one" string="Dates">
<field name="create_date"/>

2
addons/crm_todo/crm_todo_view.xml
View File

@ -58,7 +58,7 @@
id="menu_crm_todo"
parent="base.menu_sales"
action="crm_todo_action"
sequence="5"/>
sequence="6"/>
</data>

10
addons/email_template/i18n/nl.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:29+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-02 15:02+0000\n"
"Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-28 04:39+0000\n"
"X-Generator: Launchpad (build 15505)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: email_template
#: field:email.template,subtype:0
@ -192,7 +192,7 @@ msgstr ""
#. module: email_template
#: model:ir.model,name:email_template.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
msgstr "E-mail samenstellen wizard"
#. module: email_template
#: view:email.template:0

21
addons/event/event_view.xml
View File

@ -167,9 +167,9 @@
</page>
</notebook>
</sheet>
<div class="oe_sheet_width">
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</footer>
</form>
</field>
</record>
@ -468,19 +468,6 @@
</group>
</page>
<page string="Emails">
<!--
<field name="message_ids" colspan="4" nolabel="1" mode="tree">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="reply_to" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
</field>
-->
<button string="Send New Email"
name="%(mail.action_email_compose_message_wizard)d"
icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
@ -488,9 +475,9 @@
</notebook>
</sheet>
<div class="oe_sheet_width">
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</footer>
</form>
</field>
</record>

14
addons/hr_holidays/hr_holidays_view.xml
View File

@ -136,9 +136,9 @@
</page>
</notebook>
</sheet>
<div class="oe_sheet_width">
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</footer>
</form>
</field>
</record>
@ -179,11 +179,11 @@
<field name="notes"/>
</page>
</notebook>
</sheet>
<div class="oe_sheet_width">
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</form>
</sheet>
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer>
</form>
</field>
</record>

2
addons/import_sugarcrm/import_sugarcrm.py
View File

@ -949,7 +949,7 @@ class import_sugarcrm(osv.osv):
'user' : fields.boolean('User', help="Check this box to import sugarCRM Users into OpenERP users, warning if a user with the same login exist in OpenERP, user information will be erase by sugarCRM user information", readonly=True),
'opportunity': fields.boolean('Leads & Opp', help="Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads and Opportunities"),
'contact': fields.boolean('Contacts', help="Check this box to import sugarCRM Contacts into OpenERP addresses"),
'account': fields.boolean('Accounts', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
'account': fields.boolean('Partner/Account', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
'employee': fields.boolean('Employee', help="Check this box to import sugarCRM Employees into OpenERP employees"),
'meeting': fields.boolean('Meetings', help="Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"),
'call': fields.boolean('Calls', help="Check this box to import sugarCRM Calls into OpenERP calls"),

114
addons/import_sugarcrm/import_sugarcrm_view.xml
View File

@ -9,76 +9,58 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Data From SugarCRM" version="7.0">
<header>
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" class="oe_highlight" />
or
<button name="import_all" string="_Import" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="8" >
<group colspan="2" col="2" width="200">
<label colspan="2" string="Import your data from SugarCRM :"/>
<label colspan="2" string="" />
<label colspan="2" string="Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."/>
<label colspan="2" string="" />
<label colspan="2" string="Choose data you want to import. Click 'Import' to get data manually or 'Schedule Reccurent Imports' to get recurrently and automatically data."/>
<label colspan="2" string="" />
<label colspan="2" string="If you make recurrent or ponctual import, data already in OpenERP will be updated by SugarCRM data."/>
<label colspan="2" string="" />
<label colspan="2" string="Do not forget the email address to be notified of the success of the import."/>
<label colspan="2" />
<label colspan="2" string="Online documentation:"/>
<label colspan="2" string="(Coming Soon)"/>
<label colspan="2" string=""/>
</group>
<separator string="" orientation="vertical" colspan="1" rowspan="24" />
<group colspan="5">
<separator string="Login Information" colspan="4"/>
<field name="url" colspan="4" widget="url"/>
<field name="username" colspan="4"/>
<field name="password" password="True" colspan="4"/>
<header>
<button name="import_all" string="_Import"
type="object" class="oe_highlight"/>
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
type="object" class="oe_highlight" />
<button special="cancel" string="_Cancel" class="oe_link"/>
</header>
<sheet>
<group col="8" >
<group colspan="5">
<separator string="Login Information" colspan="4"/>
<field name="url" colspan="2" widget="url"/>
<field name="username" colspan="2"/>
<field name="password" password="True" colspan="2"/>
<group colspan="4">
<group colspan="1" col="2">
<separator string="Address Book" colspan="2"/>
<field name="user" />
<field name= "account" />
<field name= "contact" />
</group>
<group colspan="1" col="2">
<separator string="CRM" colspan="2"/>
<field name="opportunity" />
<field name= "call" />
<field name= "meeting" />
<field name= "claim" />
</group>
<group colspan="1" col="2">
<separator string="Project" colspan="2"/>
<field name= "project" />
<field name= "project_task" />
<field name= "bug"/>
</group>
<group colspan="1" col="2">
<separator string="HR" colspan="2"/>
<field name="employee" />
<separator string="Document" colspan="2"/>
<field name="email_history"/>
<field name= "document" />
<group colspan="4">
<separator string="Data to Import" colspan="4"/>
<group colspan="1" col="2">
<field name="user" />
<field name= "account" />
<field name= "contact" />
</group>
<group colspan="1" col="2">
<field name="opportunity" />
<field name= "call" />
<field name= "meeting" />
<field name= "claim" />
</group>
<group colspan="1" col="2">
<field name= "project" />
<field name= "project_task" />
<field name= "bug"/>
</group>
<group colspan="1" col="2">
<field name="employee" />
<field name="email_history"/>
<field name= "document" />
</group>
</group>
<group colspan="4">
<separator string="Email Notification When Import is Finished" colspan="2"/>
<field name="email_from" widget="email" string="Email Address to Notify" colspan="2"/>
</group>
<group colspan="4" groups="base.group_no_one">
<separator string="Multi Instance Management" colspan="4"/>
<field name="instance_name" colspan="2"/>
</group>
</group>
<group colspan="4">
<separator string="Email Notification When Import is Finished" colspan="4"/>
<field name="email_from" widget="email" string="Email Address to Notify" colspan="4"/>
</group>
<group colspan="4" groups="base.group_no_one">
<separator string="Multi Instance Management" colspan="4"/>
<field name="instance_name" colspan="4"/>
</group>
</group>
</group>
</sheet>
</form>
</field>
</record>

2
addons/mail/mail_group_view.xml
View File

@ -93,7 +93,7 @@
</div>
</sheet>
<footer class="openerp_mail_group_footer">
<field name="message_ids" widget="ThreadView"
<field name="message_ids" widget="mail_thread"
options='{"thread_level": 1}'/>
</footer>
</form>

2
addons/membership/membership.py
View File

@ -141,7 +141,7 @@ class membership_line(osv.osv):
_name = 'membership.membership_line'
_columns = {
'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
'membership_id': fields.many2one('product.product', string="Membership Product", required=True),
'membership_id': fields.many2one('product.product', string="Membership", required=True),
'date_from': fields.date('From', readonly=True),
'date_to': fields.date('To', readonly=True),
'date_cancel': fields.date('Cancel date'),

9
addons/membership/membership_view.xml
View File

@ -241,8 +241,11 @@
<group>
<group>
<field name="free_member"/>
<field colspan="4" name="membership_state"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
<label for="membership_state"/>
<div>
<field name="membership_state" class="oe_inline"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
</div>
</group>
<group>
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
@ -254,7 +257,7 @@
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<tree string="Memberships">
<field name="date"/>
<field name="membership_id" string="Membership"/>
<field name="membership_id"/>
<field name="member_price"/>
<field name="account_invoice_id"/>
<field name="state"/>

144
addons/point_of_sale/i18n/nl.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-02-09 11:20+0000\n"
"PO-Revision-Date: 2012-07-02 15:03+0000\n"
"Last-Translator: Erwin <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-05-11 04:42+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:35+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: point_of_sale
#: field:report.transaction.pos,product_nb:0
@ -37,6 +37,12 @@ msgid ""
"new payment methods directly from menu \"PoS Backend > Configuration > "
"Payment Methods\"."
msgstr ""
"U dient te definiëren welke betaalmethode beschikbaar dienen te zijn bij de "
"kassa. Dit kunt u doen door gebruik te maken van de bestaande bank en kas. "
"Ga naar Financieel > Instellingen > Financiële administratie > Dagboeken. "
"Selecteer een dagboek en vink te optie \"Kassa betaalmethode\" aan op het "
"kassa tabblad. Het is ook mogelijk een neiuwe betaalmethode aan te maken, "
"direct vanuit het menu Kassa achterkant >> Instellingen >> Betaalmethodes."
#. module: point_of_sale
#: view:pos.order:0 view:report.pos.order:0
@ -51,7 +57,7 @@ msgstr "Water"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Year from Creation date of cash register"
msgstr ""
msgstr "Jaar van aanmaakdatum kasregister"
#. module: point_of_sale
#: view:pos.confirm:0
@ -66,7 +72,7 @@ msgstr "Spa Reine 2L"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_box_out
msgid "Pos Box Out"
msgstr ""
msgstr "Kassa uit"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
@ -105,7 +111,7 @@ msgstr "Productnaam"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Month from Creation date of cash register"
msgstr ""
msgstr "Maand van aanmaakdatum kasregister"
#. module: point_of_sale
#: report:account.statement:0 field:pos.box.entries,amount:0
@ -308,12 +314,12 @@ msgstr "Maandelijkse verkopen per gebruiker"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
msgid "Today's Closed Cashbox"
msgstr ""
msgstr "Vandaag gesloten kassa"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Day from Creation date of cash register"
msgstr ""
msgstr "Dag van aanmaakdatum kasregister"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
@ -382,6 +388,8 @@ msgid ""
"If you want to sell this product through the point of sale, select the "
"category it belongs to."
msgstr ""
"Indien u dit product wilt verkopen bij de kassa, dan dient u de categorie te "
"selecteren waartoe het product hoort."
#. module: point_of_sale
#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@ -460,7 +468,7 @@ msgstr "Verkoopfactuur"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Output Operation"
msgstr ""
msgstr "Uitgaande verwerking"
#. module: point_of_sale
#: view:report.pos.order:0 field:report.pos.order,total_discount:0
@ -482,7 +490,7 @@ msgstr "Dr. Oetker Ristorante Bolognese"
#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
#, python-format
msgid "Please check that income account is set to %s"
msgstr ""
msgstr "Controleer of de opbrengsten rekening is ingesteld op %s"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.pizza
@ -530,7 +538,7 @@ msgstr "Betaling"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created in current month"
msgstr ""
msgstr "Kasanalyse gemaakt in de huidige maand"
#. module: point_of_sale
#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@ -587,7 +595,7 @@ msgstr "Einddatum"
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created during current year"
msgstr ""
msgstr "Kassaorders aangemaakt in huidige jaar"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
@ -691,7 +699,7 @@ msgstr "Eindsaldo"
#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
#: model:ir.model,name:point_of_sale.model_pos_close_statement
msgid "Close Statements"
msgstr ""
msgstr "Afsluit overzichten"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
@ -701,7 +709,7 @@ msgstr "Croky Naturel 45g"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
msgid "Cash Out"
msgstr ""
msgstr "Kas uit"
#. module: point_of_sale
#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@ -735,6 +743,7 @@ msgid ""
"This field authorize Validation of Cashbox without controlling the closing "
"balance."
msgstr ""
"Met dit veld kunt u de kassa inhoud valideren zonder de afsluitbalans"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@ -750,7 +759,7 @@ msgstr "Pils"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
msgid "St.Name"
msgstr ""
msgstr "St.Naam"
#. module: point_of_sale
#: report:pos.details_summary:0
@ -845,7 +854,7 @@ msgstr "Stella Artois 33cl"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created during this year"
msgstr ""
msgstr "Kasanalyse aangemaakt in huidig jaar"
#. module: point_of_sale
#: report:pos.invoice:0
@ -975,7 +984,7 @@ msgstr "Totaal korting"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_box_entries
msgid "Pos Box Entries"
msgstr ""
msgstr "Kassa boekingen"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
@ -1038,7 +1047,7 @@ msgstr "Timmermans Kriek 37.5cl"
#. module: point_of_sale
#: field:account.journal,check_dtls:0
msgid "Control Balance Before Closing"
msgstr ""
msgstr "Controleer de balans voor het sluiten"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_order_line
@ -1091,6 +1100,8 @@ msgid ""
"This is a product you can use to take cash from a statement for the point of "
"sale backend, exemple: money lost, transfer to bank, etc."
msgstr ""
"Dit is een product welke u kunt gebruiken om ontbrekend kasgeld te "
"verklaren, bijvoorbeeld: Geld verloren, geld overgemaakt aan bank, etc."
#. module: point_of_sale
#: field:report.cash.register,date:0
@ -1137,6 +1148,8 @@ msgid ""
"There is no receivable account defined to make payment for the partner: "
"\"%s\" (id:%d)"
msgstr ""
"Er is geen debiteurenrekening gedefinieerd om deze betaling te doen foor "
"klant: \"%s\" (id:%d)"
#. module: point_of_sale
#: view:pos.confirm:0
@ -1144,6 +1157,8 @@ msgid ""
"Generate all sale journal entries for non invoiced orders linked to a closed "
"cash register or statement."
msgstr ""
"Genereer alle verkoop journaalpsoten van alle niet gefactureerde orders "
"welke zijn gekoppeld aan een gesloten kasregister of kasverklaring."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:293
@ -1192,11 +1207,12 @@ msgstr "Print datum"
#, python-format
msgid "There is no receivable account defined to make payment"
msgstr ""
"Er is geen debiteurenrekening gedefinieerd om deze betaling op te doen"
#. module: point_of_sale
#: view:pos.open.statement:0
msgid "Do you want to open cash registers?"
msgstr ""
msgstr "Wilt u de kasregisters openen?"
#. module: point_of_sale
#: help:pos.category,sequence:0
@ -1208,7 +1224,7 @@ msgstr ""
#. module: point_of_sale
#: field:product.product,expense_pdt:0
msgid "PoS Cash Output"
msgstr ""
msgstr "Kas uit"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.soda
@ -1229,7 +1245,7 @@ msgstr "Kassa Orders"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
msgid "All Closed CashBox"
msgstr ""
msgstr "Alle gesloten kassa's"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:640
@ -1333,7 +1349,7 @@ msgstr "Kassa"
#: model:ir.actions.act_window,name:point_of_sale.action_product_output
#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
msgid "Products 'Put Money In'"
msgstr ""
msgstr "Producten 'Stop geld erin'"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
@ -1367,11 +1383,12 @@ msgid ""
"This is a product you can use to put cash into a statement for the point of "
"sale backend."
msgstr ""
"Dit si een product welke u kunt gebruiken om extra kasgeld te verklaren."
#. module: point_of_sale
#: view:pos.receipt:0
msgid "Print the Receipt of the Sale"
msgstr ""
msgstr "Kassabon afdrukken"
#. module: point_of_sale
#: field:pos.make.payment,journal:0
@ -1415,7 +1432,7 @@ msgstr "Evian 1L"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
msgid "Open Cash Registers"
msgstr ""
msgstr "Open kassa"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.water
@ -1450,7 +1467,7 @@ msgstr "Chimay Rouge 33cl"
#. module: point_of_sale
#: field:report.pos.order,delay_validation:0
msgid "Delay Validation"
msgstr ""
msgstr "Vertraging validatie"
#. module: point_of_sale
#: field:pos.order,nb_print:0
@ -1522,7 +1539,7 @@ msgstr "Jaar van orderdatum"
#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
#: field:pos.box.entries,journal_id:0 field:pos.box.out,journal_id:0
msgid "Cash Register"
msgstr ""
msgstr "Kasregister"
#. module: point_of_sale
#: view:pos.close.statement:0
@ -1542,7 +1559,7 @@ msgstr "Verkoop per gebruiker per dag"
#. module: point_of_sale
#: view:pos.open.statement:0
msgid "Open Registers"
msgstr ""
msgstr "Open registers"
#. module: point_of_sale
#: field:report.transaction.pos,journal_id:0
@ -1567,7 +1584,7 @@ msgstr "Dr. Oetker Ristorante Vegetale"
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created by today"
msgstr ""
msgstr "Kassaorders aangemaakt vandaag"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
@ -1592,7 +1609,7 @@ msgstr "Korting"
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created in last month"
msgstr ""
msgstr "Kasanalyse gemaakt in laatste maand"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.beers
@ -1606,11 +1623,14 @@ msgid ""
"validation. He will also open all cash registers for which you have to "
"control the ending belance before closing manually."
msgstr ""
"OpenERP sluit alle kasregisters, welke gesloten kunnen worden zonder een "
"kascontrole. Tevens worden alle kasregisters geopend waarvoor u de endbelans "
"handmatig dient te controleren."
#. module: point_of_sale
#: view:report.cash.register:0
msgid "Cash Analysis created by today"
msgstr ""
msgstr "Kasanalyse gemaakt in vandaag"
#. module: point_of_sale
#: selection:report.cash.register,state:0
@ -1620,7 +1640,7 @@ msgstr "Offerte"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
msgid "Cash In"
msgstr ""
msgstr "Kas in"
#. #-#-#-#-# point_of_sale.pot (OpenERP Server 6.1rc1) #-#-#-#-#
#. module: point_of_sale
@ -1642,7 +1662,7 @@ msgstr "Verkopen per marge"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_config_journal
msgid "Journal Configuration"
msgstr ""
msgstr "Dagboek instellingen"
#. module: point_of_sale
#: view:pos.order:0
@ -1664,7 +1684,7 @@ msgstr "Opnieuw afdrukken"
msgid ""
"Person who uses the the cash register. It could be a reliever, a student or "
"an interim employee."
msgstr ""
msgstr "Personen welke het kasregister hebben gebruikt."
#. module: point_of_sale
#: field:report.transaction.pos,invoice_id:0
@ -1687,6 +1707,9 @@ msgid ""
"payments. We suggest you to control the opening balance of each register, "
"using their CashBox tab."
msgstr ""
"Het systeem zal alle kassa's openen, zodat u de betalingen kunt gaan "
"registreren. We adviseren u om de kasinhoud bij openen te controleren van "
"iedere kassa, door gebruik te maken van het kassa tabblad."
#. module: point_of_sale
#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
@ -1838,7 +1861,7 @@ msgstr "Pepsi 2L"
#. module: point_of_sale
#: report:pos.details:0
msgid "Order"
msgstr ""
msgstr "Order"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:472
@ -1861,7 +1884,7 @@ msgstr "Verkoper"
#: model:ir.model,name:point_of_sale.model_report_cash_register
#: view:report.cash.register:0
msgid "Point of Sale Cash Register Analysis"
msgstr ""
msgstr "Kassa kasregisteranalyse"
#. module: point_of_sale
#: report:pos.lines:0
@ -1897,7 +1920,7 @@ msgstr "Verkopen per gebruiker"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
msgid "Open Cash Register"
msgstr ""
msgstr "Open kasregister"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
@ -1961,7 +1984,7 @@ msgstr "Orangina 33cl"
#: model:ir.actions.act_window,name:point_of_sale.action_product_input
#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
msgid "Products 'Take Money Out'"
msgstr ""
msgstr "Producten 'Haal geld eruit'"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
@ -1990,7 +2013,7 @@ msgstr "Dr. Oetker Ristorante Spinaci"
#: code:addons/point_of_sale/wizard/pos_box_out.py:88
#, python-format
msgid "You have to open at least one cashbox"
msgstr ""
msgstr "U moet tenminste één kassa openen"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
@ -2001,7 +2024,7 @@ msgstr "Betalingen van vandaag per gebruiker"
#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
msgid "Put Money In"
msgstr ""
msgstr "Stop geld erin"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:238
@ -2079,13 +2102,14 @@ msgstr "Chaudfontaine 1.5l"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
msgid "Close Cash Register"
msgstr ""
msgstr "Kasregister afsluiten"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:65
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
"Om een verkoop te kunnen verwijderen moet deze nieuw zijn of geannuleerd."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
@ -2128,6 +2152,8 @@ msgid ""
"This field authorize the automatic creation of the cashbox, without control "
"of the initial balance."
msgstr ""
"Dit veld geeft u de mogelijkheid om automatisch een kassa aan te makien, "
"zonder een eerste controle van de kasinhoud."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
@ -2159,7 +2185,7 @@ msgstr "Nieuw"
#: code:addons/point_of_sale/point_of_sale.py:238
#, python-format
msgid "In order to set to draft a sale, it must be cancelled."
msgstr ""
msgstr "Om in concept te zetten, moet de verkoopn worden geannuleerd"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
@ -2184,7 +2210,7 @@ msgstr "Maes 33cl"
#. module: point_of_sale
#: view:pos.box.entries:0
msgid "Put Money"
msgstr ""
msgstr "Stop geld"
#. module: point_of_sale
#: sql_constraint:account.journal:0
@ -2210,17 +2236,17 @@ msgstr "Coca-Cola Normaal 1L"
#: code:addons/point_of_sale/point_of_sale.py:253
#, python-format
msgid "Unable to cancel the picking."
msgstr ""
msgstr "Niet mogelijk om het verzamelen te stoppen."
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created during current month"
msgstr ""
msgstr "Kassaorders gemaakt in de huidige maand"
#. module: point_of_sale
#: view:report.pos.order:0
msgid "POS ordered created last month"
msgstr ""
msgstr "Kassaorders gemaakt in de vorige maand"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@ -2256,7 +2282,7 @@ msgstr "ijsboerke Chocolat 2.5L"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Take Money"
msgstr ""
msgstr "Pak geld"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_details
@ -2307,7 +2333,7 @@ msgstr "Speciale bieren"
#. module: point_of_sale
#: field:pos.order.line,notice:0
msgid "Discount Notice"
msgstr ""
msgstr "Korting opmerking"
#. module: point_of_sale
#: view:pos.order:0
@ -2361,6 +2387,8 @@ msgid ""
"Payment methods are defined by accounting journals having the field Payment "
"Method checked."
msgstr ""
"Betaalmethodes worden gedefinieerd door de journaalposten waarbij het veld "
"betaalmethode is aangevinkt."
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
@ -2426,7 +2454,7 @@ msgstr "Lays Paprika XXL 300g"
#. module: point_of_sale
#: view:pos.close.statement:0
msgid "Do you want to close your cash registers?"
msgstr ""
msgstr "Wilt u de kasregisters sluiten?"
#. module: point_of_sale
#: report:pos.invoice:0
@ -2450,7 +2478,7 @@ msgstr "Dr. Oetker Ristorante Mozzarella"
#: view:pos.close.statement:0
#, python-format
msgid "Close Cash Registers"
msgstr ""
msgstr "Kasregisters afsluiten"
#. module: point_of_sale
#: report:pos.details:0 report:pos.payment.report.user:0
@ -2505,7 +2533,7 @@ msgstr "Betalingsrapport"
#. module: point_of_sale
#: field:report.transaction.pos,jl_id:0
msgid "Cash Journals"
msgstr ""
msgstr "Kas dagboeken"
#. module: point_of_sale
#: report:pos.sales.user.today:0
@ -2536,7 +2564,7 @@ msgstr "Mei"
#. module: point_of_sale
#: report:pos.lines:0
msgid "Sales lines"
msgstr ""
msgstr "Verkooporderregels"
#. module: point_of_sale
#: view:pos.order:0
@ -2556,7 +2584,7 @@ msgstr "Coca-Cola Zero zonder cafeïne 33cl"
#. module: point_of_sale
#: view:pos.box.out:0
msgid "Describe why you take money from the cash register:"
msgstr ""
msgstr "Beschrijf wat de reden is waarom u geld uit de kassa haalt:"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
@ -2611,6 +2639,8 @@ msgid ""
"Check this box if this journal define a payment method that can be used in "
"point of sales."
msgstr ""
"Vink deze optie aan indien dit dagboek een betaalmethode is voor gebruik bij "
"de kassa"
#. module: point_of_sale
#: field:pos.category,sequence:0
@ -2641,7 +2671,7 @@ msgstr "Maand van orderdatum"
#. module: point_of_sale
#: field:product.product,income_pdt:0
msgid "PoS Cash Input"
msgstr ""
msgstr "Kassa geld inkomend"
#. module: point_of_sale
#: view:report.cash.register:0 field:report.cash.register,year:0
@ -2707,6 +2737,8 @@ msgid ""
"There are pending operations that could not be saved into the database, are "
"you sure you want to exit?"
msgstr ""
"Er zijn lopende opdrachten die niet kunnen worden opgeslagen in de database. "
"Weet u zeker dat u wilt afsluiten?"
#. openerp-web
#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
@ -3053,3 +3085,9 @@ msgstr "Winkel:"
#~ msgid "Print the receipt of the sale"
#~ msgstr "Verkoopbon afdrukken"
#~ msgid "Do you want to open cash registers ?"
#~ msgstr "Wilt u de kassa openen?"
#~ msgid "Do you want to close your cash registers ?"
#~ msgstr "Wilt u uw kasregister afsluiten?"

4
addons/product/product_view.xml
View File

@ -423,12 +423,12 @@
<field name="arch" type="xml">
<form string="Units of Measure" version="7.0">
<group>
<group string="Unit of Measure Properties">
<group>
<field name="name"/>
<field name="category_id"/>
<field name="active"/>
</group>
<group string="Ratio &amp; Precision">
<group>
<field name="uom_type" on_change="onchange_type(uom_type)"/>
<field name="rounding"/>
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>

32
addons/project_long_term/project_long_term_view.xml
View File

@ -152,23 +152,23 @@
<field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
<sheet>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="project_id" class="oe_edit_only"/>
<h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
</h2>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="project_id" class="oe_edit_only"/>
<h2>
<field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
</h2>
</div>
<group>
<group>
<field name="date_start"/>
<field name="date_end"/>
</group><group>
<label for="duration"/>
<div>
<field name="duration" class="oe_inline"/>
<field name="product_uom"/>
</div>
</group>
<label for="date_start" string="Duration"/>
<div>
<div>
<field name="duration" class="oe_inline"/>
<field name="product_uom" class="oe_inline"/>
</div>
<field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
</div>
</group>
<notebook>
<page string="Planning of Users">

2
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -105,7 +105,7 @@
</notebook>
</sheet>
<footer>
<field name="message_ids" widget="ThreadView"/>
<field name="message_ids" widget="mail_thread"/>
</footer>
</form>
</field>

13
addons/sale/sale_view.xml
View File

@ -12,15 +12,16 @@
<form string="Sales Shop" version="7.0">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="warehouse_id" class="oe_edit_only"/>
<h2><field name="warehouse_id" required="1"/></h2>
<group>
<group>
<field name="warehouse_id" required="1" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group>
<field name="payment_default_id"/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist"/>
</group>
<group>
<field name="project_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
</form>
@ -369,7 +370,7 @@
<field name="context">{"search_default_sales":1}</field>
<field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
@ -412,7 +413,7 @@
<menuitem id="menu_sale_quotations"
action="action_order_tree5" parent="base.menu_sales"
sequence="3"/>
sequence="4"/>
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">Old Quotations</field>

6
addons/stock/stock_view.xml
View File

@ -790,7 +790,7 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<field name="state" widget="statusbar" status_visible="draft,assigned,done" />
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
</header>
<group>
<group string="Move Information">
@ -1090,9 +1090,9 @@
<field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Supplier"/>
</xpath>
<xpath expr="/form/sheet" position="after">
<div class="oe_bottom">
<footer>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</div>
</footer>
</xpath>
</data>
</field>

100
addons/stock_planning/i18n/ja.po
View File

@ -8,21 +8,21 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-06-30 06:17+0000\n"
"PO-Revision-Date: 2012-07-03 03:46+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-01 04:40+0000\n"
"X-Generator: Launchpad (build 15520)\n"
"X-Launchpad-Export-Date: 2012-07-03 05:36+0000\n"
"X-Generator: Launchpad (build 15531)\n"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
#, python-format
msgid ""
"No forecasts for selected period or no products in selected category !"
msgstr ""
msgstr "選択した期間の予測がないか、選択された分類の中に製品がありません。"
#. module: stock_planning
#: help:stock.planning,stock_only:0
@ -30,76 +30,76 @@ msgid ""
"Check to calculate stock location of selected warehouse only. If not "
"selected calculation is made for input, stock and output location of "
"warehouse."
msgstr ""
msgstr "選択された倉庫のみの在庫場所を計算するためにチェックします。選択しない場合の計算は倉庫の入力、在庫、出力場所によってなされます。"
#. module: stock_planning
#: field:stock.planning,maximum_op:0
msgid "Maximum Rule"
msgstr ""
msgstr "最大値のルール"
#. module: stock_planning
#: view:stock.planning:0
#: view:stock.sale.forecast:0
msgid "Group By..."
msgstr ""
msgstr "グループ化…"
#. module: stock_planning
#: help:stock.sale.forecast,product_amt:0
msgid ""
"Forecast value which will be converted to Product Quantity according to "
"prices."
msgstr ""
msgstr "予測値は価格により製品数量に変換されます。"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:626
#: code:addons/stock_planning/stock_planning.py:670
#, python-format
msgid "Incoming Left must be greater than 0 !"
msgstr ""
msgstr "入荷の残りは0より大きい必要があります。"
#. module: stock_planning
#: help:stock.planning,outgoing_before:0
msgid ""
"Planned Out in periods before calculated. Between start date of current "
"period and one day before start of calculated period."
msgstr ""
msgstr "計算される前に期間内で計画された出荷です。現在の期間の開始日と計算された期間の開始１日前の間です。"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,warehouse_id:0
msgid ""
"Warehouse which forecasts will concern. If during stock planning you will "
"need sales forecast for all warehouses choose any warehouse now."
msgstr ""
msgstr "予測値が関連する倉庫。在庫計画の期間中に全ての倉庫の販売予測を必要とするなら、今、倉庫を選択して下さい。"
#. module: stock_planning
#: field:stock.planning,outgoing_left:0
msgid "Expected Out"
msgstr ""
msgstr "期待された出荷"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid " "
msgstr ""
msgstr " "
#. module: stock_planning
#: field:stock.planning,incoming_left:0
msgid "Incoming Left"
msgstr ""
msgstr "入荷残り"
#. module: stock_planning
#: view:stock.sale.forecast.createlines:0
msgid "Create Forecasts Lines"
msgstr ""
msgstr "予測行の作成"
#. module: stock_planning
#: help:stock.planning,outgoing:0
msgid "Quantity of all confirmed outgoing moves in calculated Period."
msgstr ""
msgstr "計算された期間の全ての確認された出荷移動の数量"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Create Daily Periods"
msgstr ""
msgstr "1日の期間の作成"
#. module: stock_planning
#: view:stock.planning:0
@ -109,45 +109,45 @@ msgstr ""
#: field:stock.sale.forecast,company_id:0
#: field:stock.sale.forecast.createlines,company_id:0
msgid "Company"
msgstr ""
msgstr "会社"
#. module: stock_planning
#: help:stock.planning,warehouse_forecast:0
msgid ""
"All sales forecasts for selected Warehouse of selected Product during "
"selected Period."
msgstr ""
msgstr "選択された期間の間で、選択された製品の倉庫を選択するための全ての販売予測"
#. module: stock_planning
#: view:stock.planning:0
msgid "Minimum Stock Rule Indicators"
msgstr ""
msgstr "最小在庫ルールの指標"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,period_id:0
msgid "Period which forecasts will concern."
msgstr ""
msgstr "予測が関係する期間"
#. module: stock_planning
#: field:stock.planning,stock_only:0
msgid "Stock Location Only"
msgstr ""
msgstr "在庫場所のみ"
#. module: stock_planning
#: help:stock.planning,already_out:0
msgid ""
"Quantity which is already dispatched out of this warehouse in current period."
msgstr ""
msgstr "現在の期間でこの倉庫の既に割り当てられた数量"
#. module: stock_planning
#: field:stock.planning,incoming:0
msgid "Confirmed In"
msgstr ""
msgstr "入庫確認"
#. module: stock_planning
#: view:stock.planning:0
msgid "Current Period Situation"
msgstr ""
msgstr "現在期間の状況"
#. module: stock_planning
#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
@ -156,11 +156,13 @@ msgid ""
"are independent of financial periods. If you need periods other than day-, "
"week- or month-based, you may also add then manually."
msgstr ""
"このウィザードは在庫計画の期間の作成を手助けします。こららの期間は会計上の期間とは独立しています。日、週、月ベースの他の期間を必要とする場合は、手動で追加"
"することができます。"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Create Monthly Periods"
msgstr ""
msgstr "月次期間の作成"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_period_createlines
@ -170,46 +172,46 @@ msgstr ""
#. module: stock_planning
#: field:stock.planning,outgoing_before:0
msgid "Planned Out Before"
msgstr ""
msgstr "以前計画された出荷"
#. module: stock_planning
#: field:stock.planning.createlines,forecasted_products:0
msgid "All Products with Forecast"
msgstr ""
msgstr "予想を持つ全製品"
#. module: stock_planning
#: help:stock.planning,maximum_op:0
msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
msgstr ""
msgstr "この倉庫のため、最大数量が最小在庫ルールで設定されます。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Periods :"
msgstr ""
msgstr "期間："
#. module: stock_planning
#: help:stock.planning,procure_to_stock:0
msgid ""
"Check to make procurement to stock location of selected warehouse. If not "
"selected procurement will be made into input location of warehouse."
msgstr ""
msgstr "選択された倉庫の在庫場所で調達を行うためにチェックします。選択しない場合は、倉庫の入力場所の中で調達が行われます。"
#. module: stock_planning
#: help:stock.planning,already_in:0
msgid ""
"Quantity which is already picked up to this warehouse in current period."
msgstr ""
msgstr "現在の期間に既にこの倉庫に集められた数量"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
#, python-format
msgid "No products in selected category !"
msgstr ""
msgstr "選択された分類の中に製品がありません。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Stock and Sales Forecast"
msgstr ""
msgstr "在庫と販売予測"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_sale_forecast
@ -219,12 +221,12 @@ msgstr ""
#. module: stock_planning
#: field:stock.planning,to_procure:0
msgid "Planned In"
msgstr ""
msgstr "計画入庫"
#. module: stock_planning
#: field:stock.planning,stock_simulation:0
msgid "Stock Simulation"
msgstr ""
msgstr "在庫シミュレーション"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_planning_createlines
@ -237,60 +239,60 @@ msgid ""
"Confirmed incoming in periods before calculated (Including Already In). "
"Between start date of current period and one day before start of calculated "
"period."
msgstr ""
msgstr "計算する前に期間内で確認された入庫（既に入庫分を含む）です。現在の期間の開始日と計算された期間の開始１日前の間です。"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Search Sales Forecast"
msgstr ""
msgstr "販売予測の検索"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_user:0
msgid "This User Period5"
msgstr ""
msgstr "このユーザの期間5"
#. module: stock_planning
#: help:stock.planning,history:0
msgid "History of procurement or internal supply of this planning line."
msgstr ""
msgstr "この計画行の調達、または内部供給の履歴"
#. module: stock_planning
#: help:stock.planning,company_forecast:0
msgid ""
"All sales forecasts for whole company (for all Warehouses) of selected "
"Product during selected Period."
msgstr ""
msgstr "選択した期間中に選択した商品の会社全体（全ての倉庫）ための全ての販売予測です。"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_user:0
msgid "This User Period1"
msgstr ""
msgstr "このユーザの期間1"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_user:0
msgid "This User Period3"
msgstr ""
msgstr "このユーザの期間3"
#. module: stock_planning
#: view:stock.planning:0
msgid "Stock Planning"
msgstr ""
msgstr "在庫計画"
#. module: stock_planning
#: field:stock.planning,minimum_op:0
msgid "Minimum Rule"
msgstr ""
msgstr "最小値のルール"
#. module: stock_planning
#: view:stock.planning:0
msgid "Procure Incoming Left"
msgstr ""
msgstr "調達入庫の残り"
#. module: stock_planning
#: view:stock.planning.createlines:0
#: view:stock.sale.forecast.createlines:0
msgid "Create"
msgstr ""
msgstr "作成"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
@ -298,12 +300,12 @@ msgstr ""
#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
#: view:stock.planning:0
msgid "Master Procurement Schedule"
msgstr ""
msgstr "マスター調達スケジュール"
#. module: stock_planning
#: field:stock.planning,line_time:0
msgid "Past/Future"
msgstr ""
msgstr "過去 / 将来"
#. module: stock_planning
#: view:stock.period:0

20
addons/wiki/wiki_view.xml
View File

@ -129,16 +129,22 @@
<field name="arch" type="xml">
<form string="Wiki" version="7.0">
<sheet>
<group col="6" colspan="4">
<field name="name" colspan="6"/>
<field name="group_id" string="Topic" on_change="onchange_group_id(group_id, text_area)"/>
<field name="parent_id" domain="[('group_id','=',group_id)]"/>
<field name="section"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name" select="1" /></h1>
<label for="group_id" class="oe_edit_only"/>
<h2>
<field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
</div>
<group>
<group>
<field name="parent_id" domain="[('group_id','=',group_id)]"/>
<field name="section"/>
</group>
</group>
<notebook colspan="4">
<page string="Content">
<separator colspan="4" string="Page Content"/>
<field name="text_area" nolabel="1" colspan="4" widget="text_wiki"/>
<field name="text_area" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content"/>
</page>
</notebook>
<group col="2" colspan="2" groups="base.group_no_one">