pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge from trunk addons

Browse Source 
bzr revid: mra@mra-laptop-20101012072702-1ny1xwewte13ke5q
This commit is contained in:
Mustufa Rangwala
2010-10-12 12:57:02 +05:30
parent 09a5900b5f af6d14b9c4
commit 72d7ec5a49
56 changed files with 1074 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/de.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-10-10 10:37+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:18+0000\n"
"Last-Translator: Ferdinand-chricar <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: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/mn.po
+10 -10
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-10-11 04:27+0000\n"
"Last-Translator: sugi <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:18+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Mongolian <mn@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: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1983,7 +1983,7 @@ msgstr "Шилжүүлэлт"
#. module: account
#: rml:account.overdue:0
msgid "Li."
msgstr ""
msgstr "Ли."
#. module: account
#: wizard_view:account.chart,init:0
@@ -2262,7 +2262,7 @@ msgstr "Дансны мод"
#. module: account
#: model:account.journal,name:account.check_journal
msgid "x Checks Journal"
msgstr ""
msgstr "x Чекийн журнал"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_generate_subscription
@@ -4413,7 +4413,7 @@ msgstr "Батлагдсан"
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Credit Notes"
msgstr ""
msgstr "Орлогын тэмдэглэл"
#. module: account
#: field:account.config.wizard,date2:0
@@ -4430,12 +4430,12 @@ msgstr "Нээлтийн бичилтийг цуцлах"
#. module: account
#: model:process.transition,name:account.process_transition_invoicemanually0
msgid "Manually statement"
msgstr ""
msgstr "Гараар үүсгэсэн тайлан"
#. module: account
#: field:account.payment.term.line,days2:0
msgid "Day of the Month"
msgstr ""
msgstr "Сарын өдөр"
#. module: account
#: field:account.analytic.journal,line_ids:0
@@ -4493,12 +4493,12 @@ msgstr ""
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
msgid "Open Invoice"
msgstr ""
msgstr "Нэхэмжлэл нээх"
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
msgid "Set starting and ending balance for control"
msgstr ""
msgstr "Балансын удирдлагын эхлэл төгсгөлийг тохируулах"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
addons/account/report/account_central_journal.rml
+2 -2
View File
@@ -293,7 +293,7 @@
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
</blockTable>
<blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
<blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td><para style="terp_default_9">[[ line['code'] ]]</para></td>
<td><para style="terp_default_9">[[ line['name'] ]]</para></td>
addons/account_report/i18n/it.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-09-29 08:36+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-10-11 20:16+0000\n"
"Last-Translator: simone.sandri <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: 2010-09-30 04:38+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
@@ -308,7 +308,7 @@ msgstr "Report per personale Contabile"
#: model:ir.actions.act_window,name:account_report.action_account_report_form
#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
msgid "New Reporting Item Formula"
msgstr ""
msgstr "Nuova Formula di Riporto Oggetti"
#. module: account_report
#: field:account.report.report,code:0
addons/analytic/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-06-18 10:59+0000\n"
"PO-Revision-Date: 2010-10-10 10:41+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:17+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
addons/claim_from_delivery/claim_delivery_view.xml
+2 -15
View File
@@ -1,18 +1,5 @@
<openerp>
<data>
<record id="view_picking_delivery" model="ir.ui.view">
<field name="name">stock.picking.delivery.form20</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="priority" eval="2"/>
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
<field name="arch" type="xml">
<xpath expr="//form/group/field[@name='date']" position="after">
<field name="partner_id" invisible="1"/>
</xpath>
</field>
</record>
<data>
<act_window id="action_claim_from_delivery" name="Claim"
domain="[]" target="current"
@@ -20,5 +7,5 @@
view_mode="form" res_model="crm.claim"
src_model="stock.picking" />
</data>
</data>
</openerp>
addons/claim_from_delivery/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 12:02+0000\n"
"PO-Revision-Date: 2010-10-10 10:45+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:17+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: claim_from_delivery
addons/crm/board_crm_view.xml
+1 -2
View File
@@ -158,6 +158,5 @@
action="open_board_crm"
sequence="1"
id="menu_board_crm" icon="terp-graph"/>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
</data>
</openerp>
</openerp>
addons/crm/i18n/nl.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-10-10 08:54+0000\n"
"PO-Revision-Date: 2010-10-11 13:45+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -583,7 +583,7 @@ msgstr "Augustus"
#. module: crm
#: view:crm.meeting:0
msgid "Meetings Tree"
msgstr "Afsprakenboom"
msgstr "Afspraken"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -4006,7 +4006,7 @@ msgstr "ICS bestand opslaan"
#. module: crm
#: wizard_field:caldav.crm.subscribe,init,url_path:0
msgid "Provide path for remote calendar"
msgstr "Geef het pas naar de remote agenda"
msgstr "Geef het pad naar de remote agenda"
#. module: crm
#: view:crm.case.log:0
addons/crm_fundraising/i18n/nl.po
+149 -131
View File
@@ -8,35 +8,35 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 12:29+0000\n"
"PO-Revision-Date: 2010-09-10 14:23+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2010-10-11 09:58+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-09-29 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_fundraising
#: field:crm.fundraising,planned_revenue:0
msgid "Planned Revenue"
msgstr ""
msgstr "Verwachte omzet"
#. module: crm_fundraising
#: field:crm.fundraising.report,nbr:0
msgid "# of Cases"
msgstr ""
msgstr "# Fondsen"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: view:crm.fundraising.report:0
msgid "Group By..."
msgstr ""
msgstr "Groepeer op.."
#. module: crm_fundraising
#: field:crm.fundraising.report,probability:0
msgid "Avg. Probability"
msgstr ""
msgstr "Gemiddelde kans"
#. module: crm_fundraising
#: help:crm.fundraising,canal_id:0
@@ -45,207 +45,211 @@ msgid ""
"customer. With each commercial opportunity, you can indicate "
" the canall which is this opportunity source."
msgstr ""
"De kanalen geven de verschillende beschikbare communicatievormen met de "
"klant weer. Met elke kans kunt u het kanaal aangeven wat de oorsprong van de "
"kans is."
#. module: crm_fundraising
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Funds Form"
msgstr ""
msgstr "Fondsenformulier"
#. module: crm_fundraising
#: field:crm.fundraising.report,delay_close:0
msgid "Delay to close"
msgstr ""
msgstr "Vertraging tot sluiting"
#. module: crm_fundraising
#: field:crm.fundraising,company_id:0
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,company_id:0
msgid "Company"
msgstr ""
msgstr "Bedrijf"
#. module: crm_fundraising
#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
msgid "Fundraising Categories"
msgstr ""
msgstr "Fondscategorieën"
#. module: crm_fundraising
#: field:crm.fundraising,email_cc:0
msgid "Watchers Emails"
msgstr ""
msgstr "Email toeschouwers"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "This Year"
msgstr ""
msgstr "Dit jaar"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "Cases"
msgstr ""
msgstr "Dossiers"
#. module: crm_fundraising
#: selection:crm.fundraising,priority:0
msgid "Highest"
msgstr ""
msgstr "Hoogste"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,day:0
msgid "Day"
msgstr ""
msgstr "Dag"
#. module: crm_fundraising
#: field:crm.fundraising,partner_mobile:0
msgid "Mobile"
msgstr ""
msgstr "Mobiel"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Notes"
msgstr ""
msgstr "Notities"
#. module: crm_fundraising
#: field:crm.fundraising,message_ids:0
msgid "Messages"
msgstr ""
msgstr "Berichten"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Amount"
msgstr ""
msgstr "Bedrag"
#. module: crm_fundraising
#: selection:crm.fundraising,state:0
#: selection:crm.fundraising.report,state:0
msgid "Cancelled"
msgstr ""
msgstr "Geannuleerd"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,amount_revenue:0
msgid "Est.Revenue"
msgstr ""
msgstr "Gesch. omzet"
#. module: crm_fundraising
#: field:crm.fundraising,partner_address_id:0
msgid "Partner Contact"
msgstr ""
msgstr "Contactpersoon relatie"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "My Case"
msgstr ""
msgstr "Mijn Fondsen"
#. module: crm_fundraising
#: field:crm.fundraising,ref:0
msgid "Reference"
msgstr ""
msgstr "Verwijzing"
#. module: crm_fundraising
#: field:crm.fundraising,date_action_next:0
msgid "Next Action"
msgstr ""
msgstr "Volgende actie"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Reset to Draft"
msgstr ""
msgstr "Terugzetten naar Concept"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Extra Info"
msgstr ""
msgstr "Extra informatie"
#. module: crm_fundraising
#: model:ir.model,name:crm_fundraising.model_crm_fundraising
#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
msgstr "Fondsenwerving"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: field:crm.fundraising,partner_id:0
#: field:crm.fundraising.report,partner_id:0
msgid "Partner"
msgstr ""
msgstr "Relatie"
#. module: crm_fundraising
#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
msgid "Fundraising Analysis"
msgstr ""
msgstr "Fondsenwerving Analyse"
#. module: crm_fundraising
#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
msgid "CRM Fundraising"
msgstr ""
msgstr "CRM Fondsenwerving"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Estimates"
msgstr ""
msgstr "Schattingen"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,section_id:0
msgid "Section"
msgstr ""
msgstr "Afdeling"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Dates"
msgstr ""
msgstr "Data"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: field:crm.fundraising,priority:0
msgid "Priority"
msgstr ""
msgstr "Prioriteit"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Send New Email"
msgstr ""
msgstr "Verstuur nieuwe email"
#. module: crm_fundraising
#: model:crm.case.categ,name:crm_fundraising.categ_fund1
msgid "Social Rehabilitation And Rural Upliftment"
msgstr ""
"Sociale reïntegratie en ontwikkelingsstimulans niet-stedelijke gebieden"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Payment Mode"
msgstr ""
msgstr "Betalingsvorm"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Reply"
msgstr ""
msgstr "Beantwoorden"
#. module: crm_fundraising
#: field:crm.fundraising,email_from:0
msgid "Email"
msgstr ""
msgstr "Email"
#. module: crm_fundraising
#: field:crm.fundraising,canal_id:0
msgid "Channel"
msgstr ""
msgstr "Kanaal"
#. module: crm_fundraising
#: selection:crm.fundraising,priority:0
msgid "Lowest"
msgstr ""
msgstr "Laagste"
#. module: crm_fundraising
#: field:crm.fundraising,create_date:0
msgid "Creation Date"
msgstr ""
msgstr "Aanmaakdatum"
#. module: crm_fundraising
#: view:crm.fundraising:0
@@ -253,127 +257,127 @@ msgstr ""
#: view:crm.fundraising.report:0
#: selection:crm.fundraising.report,state:0
msgid "Pending"
msgstr ""
msgstr "Wacht"
#. module: crm_fundraising
#: field:crm.fundraising,date_deadline:0
msgid "Deadline"
msgstr ""
msgstr "Uiterste datum"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "July"
msgstr ""
msgstr "Juli"
#. module: crm_fundraising
#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
msgid "Categories"
msgstr ""
msgstr "Categorieën"
#. module: crm_fundraising
#: field:crm.fundraising,stage_id:0
msgid "Stage"
msgstr ""
msgstr "Fase"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "History Information"
msgstr ""
msgstr "Historie Informatie"
#. module: crm_fundraising
#: field:crm.fundraising,date_closed:0
#: selection:crm.fundraising,state:0
#: selection:crm.fundraising.report,state:0
msgid "Closed"
msgstr ""
msgstr "Gesloten"
#. module: crm_fundraising
#: field:crm.fundraising,partner_name2:0
msgid "Employee Email"
msgstr ""
msgstr "E-mail werknemer"
#. module: crm_fundraising
#: model:crm.case.categ,name:crm_fundraising.categ_fund2
msgid "Learning And Education"
msgstr ""
msgstr "Leren en onderwijs"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Contact"
msgstr ""
msgstr "Contactpersoon"
#. module: crm_fundraising
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "Ongeldige XML voor weergave opbouw!"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "March"
msgstr ""
msgstr "Maart"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Fund Description"
msgstr ""
msgstr "Fonds omschrijving"
#. module: crm_fundraising
#: help:crm.fundraising.report,delay_close:0
msgid "Number of Days to close the case"
msgstr ""
msgstr "Aantal dagen om werving af te sluiten"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
#: model:ir.module.module,description:crm_fundraising.module_meta_information
msgid "Fundraising"
msgstr ""
msgstr "Fondsenwerving"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "September"
msgstr ""
msgstr "September"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "December"
msgstr ""
msgstr "December"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Funds Tree"
msgstr ""
msgstr "Fondsen"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,month:0
msgid "Month"
msgstr ""
msgstr "Maand"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Escalate"
msgstr ""
msgstr "Escaleren"
#. module: crm_fundraising
#: field:crm.fundraising,write_date:0
msgid "Update Date"
msgstr ""
msgstr "Wijzigingsdatum"
#. module: crm_fundraising
#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
msgid "Credit Card"
msgstr ""
msgstr "Creditcard"
#. module: crm_fundraising
#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
msgid "Fundraising Stages"
msgstr ""
msgstr "Fondswerving fasen"
#. module: crm_fundraising
#: field:crm.fundraising,ref2:0
msgid "Reference 2"
msgstr ""
msgstr "Referentie 2"
#. module: crm_fundraising
#: view:crm.fundraising:0
@@ -381,17 +385,17 @@ msgstr ""
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,categ_id:0
msgid "Category"
msgstr ""
msgstr "Categorie"
#. module: crm_fundraising
#: model:crm.case.categ,name:crm_fundraising.categ_fund4
msgid "Arts And Culture"
msgstr ""
msgstr "Kunst en cultuur"
#. module: crm_fundraising
#: field:crm.fundraising,planned_cost:0
msgid "Planned Costs"
msgstr ""
msgstr "Verwachte kosten"
#. module: crm_fundraising
#: help:crm.fundraising,email_cc:0
@@ -400,145 +404,148 @@ msgid ""
"outbound emails for this record before being sent. Separate multiple email "
"addresses with a comma"
msgstr ""
"Deze email adressen worden toegevoegd aan het CC veld van alle inkomende en "
"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen "
"scheidt u met een komma (,)."
#. module: crm_fundraising
#: selection:crm.fundraising,state:0
#: view:crm.fundraising.report:0
#: selection:crm.fundraising.report,state:0
msgid "Draft"
msgstr ""
msgstr "Concept"
#. module: crm_fundraising
#: selection:crm.fundraising,priority:0
msgid "Low"
msgstr ""
msgstr "Laag"
#. module: crm_fundraising
#: constraint:ir.ui.menu:0
msgid "Error ! You can not create recursive Menu."
msgstr ""
msgstr "Fout ! U kunt geen recursief menu maken."
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "7 Days"
msgstr ""
msgstr "7 Dagen"
#. module: crm_fundraising
#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
msgid "Stages"
msgstr ""
msgstr "Fasen"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "August"
msgstr ""
msgstr "Augustus"
#. module: crm_fundraising
#: selection:crm.fundraising,priority:0
msgid "Normal"
msgstr ""
msgstr "Normaal"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Global CC"
msgstr ""
msgstr "Globale CC"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
msgid "Funds"
msgstr ""
msgstr "Fondsen"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "June"
msgstr ""
msgstr "Juni"
#. module: crm_fundraising
#: field:crm.fundraising,partner_phone:0
msgid "Phone"
msgstr ""
msgstr "Telefoon"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,user_id:0
msgid "User"
msgstr ""
msgstr "Gebruiker"
#. module: crm_fundraising
#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
msgid "Cheque"
msgstr ""
msgstr "Cheque"
#. module: crm_fundraising
#: field:crm.fundraising,active:0
msgid "Active"
msgstr ""
msgstr "Actief"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "November"
msgstr ""
msgstr "November"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "Extended Filters..."
msgstr ""
msgstr "Uitgebreide filters..."
#. module: crm_fundraising
#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_resource_act
msgid "Resource Type"
msgstr ""
msgstr "Betalingsvorm"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "Search"
msgstr ""
msgstr "Zoeken"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "October"
msgstr ""
msgstr "Oktober"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "January"
msgstr ""
msgstr "Januari"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "#Fundraising"
msgstr ""
msgstr "# Fondsen"
#. module: crm_fundraising
#: help:crm.fundraising,email_from:0
msgid "These people will receive email."
msgstr ""
msgstr "Deze personen ontvangen email."
#. module: crm_fundraising
#: field:crm.fundraising,date:0
msgid "Date"
msgstr ""
msgstr "Datum"
#. module: crm_fundraising
#: model:crm.case.categ,name:crm_fundraising.categ_fund3
msgid "Healthcare"
msgstr ""
msgstr "Gezondheidszorg"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "History"
msgstr ""
msgstr "Historie"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Attachments"
msgstr ""
msgstr "Bijlagen"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Misc"
msgstr ""
msgstr "Overig"
#. module: crm_fundraising
#: view:crm.fundraising:0
@@ -546,24 +553,24 @@ msgstr ""
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,state:0
msgid "State"
msgstr ""
msgstr "Status"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: view:crm.fundraising.report:0
msgid "Done"
msgstr ""
msgstr "Klaar"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Communication"
msgstr ""
msgstr "Communicatie"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: view:crm.fundraising.report:0
msgid "Cancel"
msgstr ""
msgstr "Annuleren"
#. module: crm_fundraising
#: view:crm.fundraising:0
@@ -571,24 +578,25 @@ msgstr ""
#: view:crm.fundraising.report:0
#: selection:crm.fundraising.report,state:0
msgid "Open"
msgstr ""
msgstr "Open"
#. module: crm_fundraising
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: field:crm.fundraising,user_id:0
msgid "Responsible"
msgstr ""
msgstr "Verantwoordelijke"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Current"
msgstr ""
msgstr "Actueel"
#. module: crm_fundraising
#: help:crm.fundraising,section_id:0
@@ -596,57 +604,59 @@ msgid ""
"Sales team to which Case belongs to. Define Responsible user and Email "
"account for mail gateway."
msgstr ""
"Verkoopteam waaraan dit fonds is toegewezen. Definieer de verantwoordelijke "
"gebruiker en Email account voor de mail gateway."
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Details"
msgstr ""
msgstr "Details"
#. module: crm_fundraising
#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
msgid "CRM Fundraising Report"
msgstr ""
msgstr "CRM Fondsenwerving overzicht"
#. module: crm_fundraising
#: field:crm.fundraising,type_id:0
msgid "Fundraising Type"
msgstr ""
msgstr "Betalingsvorm"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,amount_revenue_prob:0
msgid "Est. Rev*Prob."
msgstr ""
msgstr "Verw. omzet*kans"
#. module: crm_fundraising
#: field:crm.fundraising,description:0
msgid "Description"
msgstr ""
msgstr "Omschrijving"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "May"
msgstr ""
msgstr "Mei"
#. module: crm_fundraising
#: field:crm.fundraising,probability:0
msgid "Probability (%)"
msgstr ""
msgstr "Waarschijnlijkheid (%)"
#. module: crm_fundraising
#: field:crm.fundraising,partner_name:0
msgid "Employee's Name"
msgstr ""
msgstr "Relatienaam"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid "This Month"
msgstr ""
msgstr "Deze maand"
#. module: crm_fundraising
#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_resource_act
msgid "Fundraising Resource Type"
msgstr ""
msgstr "Fondsenwerving betalingsvorm"
#. module: crm_fundraising
#: help:crm.fundraising,state:0
@@ -659,86 +669,94 @@ msgid ""
" \n"
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
"De status wordt op 'Concept' gezet als de aanvraag wordt gemaakt. "
" \n"
"Als de aanvraag in behandeling is, wordt de status op 'Open' gezet. "
" \n"
"Als de aanvraag klaar is, gaat de status naar 'Gereed'. "
" \n"
"Als de aanvraag moet worden onderzocht, wordt de status op 'Behandeling' "
"gezet."
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "February"
msgstr ""
msgstr "Februari"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: field:crm.fundraising,name:0
msgid "Name"
msgstr ""
msgstr "Naam"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Communication history"
msgstr ""
msgstr "Communicatiegeschiedenis"
#. module: crm_fundraising
#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
msgid "Cash"
msgstr ""
msgstr "Contant"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Funds by Categories"
msgstr ""
msgstr "Fondsen op categorie"
#. module: crm_fundraising
#: selection:crm.fundraising.report,month:0
msgid "April"
msgstr ""
msgstr "April"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "References"
msgstr ""
msgstr "Verwijzingen"
#. module: crm_fundraising
#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
msgid "Demand Draft"
msgstr ""
msgstr "Incasso"
#. module: crm_fundraising
#: field:crm.fundraising,id:0
msgid "ID"
msgstr ""
msgstr "ID"
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Search Funds"
msgstr ""
msgstr "Zoek fondsen"
#. module: crm_fundraising
#: selection:crm.fundraising,priority:0
msgid "High"
msgstr ""
msgstr "Hoog"
#. module: crm_fundraising
#: view:crm.fundraising:0
#: field:crm.fundraising,section_id:0
msgid "Sales Team"
msgstr ""
msgstr "Verkoopteam"
#. module: crm_fundraising
#: field:crm.fundraising.report,create_date:0
msgid "Create Date"
msgstr ""
msgstr "Aanmaakdatum"
#. module: crm_fundraising
#: field:crm.fundraising,date_action_last:0
msgid "Last Action"
msgstr ""
msgstr "Laatste actie"
#. module: crm_fundraising
#: view:crm.fundraising.report:0
#: field:crm.fundraising.report,name:0
msgid "Year"
msgstr ""
msgstr "Jaar"
#. module: crm_fundraising
#: field:crm.fundraising,duration:0
msgid "Duration"
msgstr ""
msgstr "Duur"
addons/crm_helpdesk/i18n/nl.po
+130 -114
View File
@@ -8,124 +8,124 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 13:01+0000\n"
"PO-Revision-Date: 2010-09-10 09:13+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2010-10-11 08:22+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-09-29 05:18+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_helpdesk
#: field:crm.helpdesk.report,nbr:0
msgid "# of Cases"
msgstr ""
msgstr "# Aanvragen"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: view:crm.helpdesk.report:0
msgid "Group By..."
msgstr ""
msgstr "Groepeer op.."
#. module: crm_helpdesk
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Today"
msgstr ""
msgstr "Vandaag"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "March"
msgstr ""
msgstr "Maart"
#. module: crm_helpdesk
#: field:crm.helpdesk.report,delay_close:0
msgid "Delay to close"
msgstr ""
msgstr "Vertraging tot sluiting"
#. module: crm_helpdesk
#: field:crm.helpdesk,company_id:0
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,company_id:0
msgid "Company"
msgstr ""
msgstr "Bedrijf"
#. module: crm_helpdesk
#: field:crm.helpdesk,email_cc:0
msgid "Watchers Emails"
msgstr ""
msgstr "Emails toeschouwers"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "This Year"
msgstr ""
msgstr "Dit jaar"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Cases"
msgstr ""
msgstr "Aanvragen"
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
#: selection:crm.helpdesk.report,priority:0
msgid "Highest"
msgstr ""
msgstr "Hoogste"
#. module: crm_helpdesk
#: field:crm.helpdesk.report,day:0
msgid "Day"
msgstr ""
msgstr "Dag"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Notes"
msgstr ""
msgstr "Notities"
#. module: crm_helpdesk
#: field:crm.helpdesk,message_ids:0
msgid "Messages"
msgstr ""
msgstr "Berichten"
#. module: crm_helpdesk
#: selection:crm.helpdesk,state:0
#: selection:crm.helpdesk.report,state:0
msgid "Cancelled"
msgstr ""
msgstr "Geannuleerd"
#. module: crm_helpdesk
#: field:crm.helpdesk,partner_address_id:0
msgid "Partner Contact"
msgstr ""
msgstr "Contactpersoon relatie"
#. module: crm_helpdesk
#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
msgid "Helpdesk Analysis"
msgstr ""
msgstr "Helpdesk Analyse"
#. module: crm_helpdesk
#: field:crm.helpdesk,ref:0
msgid "Reference"
msgstr ""
msgstr "Verwijzing"
#. module: crm_helpdesk
#: field:crm.helpdesk,date_action_next:0
msgid "Next Action"
msgstr ""
msgstr "Volgende actie"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Helpdesk Supports"
msgstr ""
msgstr "Helpdesk ondersteuning"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Extra Info"
msgstr ""
msgstr "Extra info"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -133,30 +133,30 @@ msgstr ""
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,partner_id:0
msgid "Partner"
msgstr ""
msgstr "Relatie"
#. module: crm_helpdesk
#: field:crm.helpdesk,date_closed:0
#: selection:crm.helpdesk,state:0
#: selection:crm.helpdesk.report,state:0
msgid "Closed"
msgstr ""
msgstr "Gesloten"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Estimates"
msgstr ""
msgstr "Schattingen"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,section_id:0
msgid "Section"
msgstr ""
msgstr "Afdeling"
#. module: crm_helpdesk
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "Ongeldige XML voor weergave opbouw!"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -164,60 +164,60 @@ msgstr ""
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,priority:0
msgid "Priority"
msgstr ""
msgstr "Prioriteit"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Send New Email"
msgstr ""
msgstr "Verstuur nieuwe email"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Won"
msgstr ""
msgstr "Gewonnen"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Reply"
msgstr ""
msgstr "Beantwoorden"
#. module: crm_helpdesk
#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
msgid "Helpdesk report after Sales Services"
msgstr ""
msgstr "Helpdesk overzicht Nazorg"
#. module: crm_helpdesk
#: field:crm.helpdesk,email_from:0
msgid "Email"
msgstr ""
msgstr "Email"
#. module: crm_helpdesk
#: field:crm.helpdesk,canal_id:0
msgid "Channel"
msgstr ""
msgstr "Kanaal"
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
#: selection:crm.helpdesk.report,priority:0
msgid "Lowest"
msgstr ""
msgstr "Laagste"
#. module: crm_helpdesk
#: field:crm.helpdesk,create_date:0
msgid "Creation Date"
msgstr ""
msgstr "Aanmaakdatum"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Reset to Draft"
msgstr ""
msgstr "Terugzetten naar Concept"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: selection:crm.helpdesk,state:0
#: selection:crm.helpdesk.report,state:0
msgid "Pending"
msgstr ""
msgstr "Wacht"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -225,37 +225,37 @@ msgstr ""
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,date_deadline:0
msgid "Deadline"
msgstr ""
msgstr "Uiterste datum"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "July"
msgstr ""
msgstr "July"
#. module: crm_helpdesk
#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
msgid "Helpdesk Categories"
msgstr ""
msgstr "Helpdesk categorieën"
#. module: crm_helpdesk
#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
msgid "Categories"
msgstr ""
msgstr "Categorieën"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "History Information"
msgstr ""
msgstr "Historie informatie"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Dates"
msgstr ""
msgstr "Data"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "#Helpdesk"
msgstr ""
msgstr "#Helpdesk"
#. module: crm_helpdesk
#: help:crm.helpdesk,email_cc:0
@@ -264,187 +264,190 @@ msgid ""
"outbound emails for this record before being sent. Separate multiple email "
"addresses with a comma"
msgstr ""
"Deze email addressen worden toegevoegd aan het CC veld van alle inkomende en "
"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen "
"scheidt u met een komma (,)."
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "September"
msgstr ""
msgstr "September"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "December"
msgstr ""
msgstr "December"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,month:0
msgid "Month"
msgstr ""
msgstr "Maand"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Escalate"
msgstr ""
msgstr "Escaleren"
#. module: crm_helpdesk
#: field:crm.helpdesk,write_date:0
msgid "Update Date"
msgstr ""
msgstr "Wijzigingsdatum"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Query"
msgstr ""
msgstr "Aanvraag"
#. module: crm_helpdesk
#: field:crm.helpdesk,ref2:0
msgid "Reference 2"
msgstr ""
msgstr "Referentie 2"
#. module: crm_helpdesk
#: field:crm.helpdesk,categ_id:0
msgid "Category"
msgstr ""
msgstr "Categorie"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Helpdesk Support"
msgstr ""
msgstr "Helpdesk ondersteuning"
#. module: crm_helpdesk
#: field:crm.helpdesk,planned_cost:0
msgid "Planned Costs"
msgstr ""
msgstr "Verwachte kosten"
#. module: crm_helpdesk
#: model:ir.module.module,description:crm_helpdesk.module_meta_information
msgid "Helpdesk Management"
msgstr ""
msgstr "Helpdesk management"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Search Helpdesk"
msgstr ""
msgstr "Zoek helpdesk"
#. module: crm_helpdesk
#: selection:crm.helpdesk,state:0
#: selection:crm.helpdesk.report,state:0
msgid "Draft"
msgstr ""
msgstr "Concept"
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
#: selection:crm.helpdesk.report,priority:0
msgid "Low"
msgstr ""
msgstr "Laag"
#. module: crm_helpdesk
#: constraint:ir.ui.menu:0
msgid "Error ! You can not create recursive Menu."
msgstr ""
msgstr "Fout ! U kunt geen recursief menu maken."
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "7 Days"
msgstr ""
msgstr "7 Dagen"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "August"
msgstr ""
msgstr "Augustus"
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
#: selection:crm.helpdesk.report,priority:0
msgid "Normal"
msgstr ""
msgstr "Normaal"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Global CC"
msgstr ""
msgstr "Globale CC"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "June"
msgstr ""
msgstr "Juni"
#. module: crm_helpdesk
#: field:crm.helpdesk,planned_revenue:0
msgid "Planned Revenue"
msgstr ""
msgstr "Verwachte omzet"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,user_id:0
msgid "User"
msgstr ""
msgstr "Gebruiker"
#. module: crm_helpdesk
#: field:crm.helpdesk,active:0
msgid "Active"
msgstr ""
msgstr "Actief"
#. module: crm_helpdesk
#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
msgid "CRM Helpdesk"
msgstr ""
msgstr "CRM Helpdesk"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Extended Filters..."
msgstr ""
msgstr "Uitgebreide filters..."
#. module: crm_helpdesk
#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
msgid "Helpdesk Requests"
msgstr ""
msgstr "Helpdesk aanvragen"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Search"
msgstr ""
msgstr "Zoeken"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "October"
msgstr ""
msgstr "Oktober"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "January"
msgstr ""
msgstr "Januari"
#. module: crm_helpdesk
#: help:crm.helpdesk,email_from:0
msgid "These people will receive email."
msgstr ""
msgstr "Deze personen ontvangen email."
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: field:crm.helpdesk,date:0
msgid "Date"
msgstr ""
msgstr "Datum"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "November"
msgstr ""
msgstr "November"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "History"
msgstr ""
msgstr "Historie"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Attachments"
msgstr ""
msgstr "Bijlagen"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Misc"
msgstr ""
msgstr "Overig"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -452,17 +455,17 @@ msgstr ""
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,state:0
msgid "State"
msgstr ""
msgstr "Status"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "General"
msgstr ""
msgstr "Algemeen"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Send Reminder"
msgstr ""
msgstr "Verstuur herinnering"
#. module: crm_helpdesk
#: help:crm.helpdesk,section_id:0
@@ -470,49 +473,52 @@ msgid ""
"Sales team to which Case belongs to. Define "
"Responsible user and Email account for mail gateway."
msgstr ""
"Verkoopteam waaraan aanvraag is toegewezen. Definieer Verantwoordelijke "
"gebruiker en Email account voor mail gateway."
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Done"
msgstr ""
msgstr "Klaar"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Communication"
msgstr ""
msgstr "Communicatie"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Cancel"
msgstr ""
msgstr "Annuleren"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Close"
msgstr ""
msgstr "Sluiten"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: selection:crm.helpdesk,state:0
#: selection:crm.helpdesk.report,state:0
msgid "Open"
msgstr ""
msgstr "Open"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Helpdesk Support Tree"
msgstr ""
msgstr "Helpdesk aanvragen"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Categorization"
msgstr ""
msgstr "Classificatie"
#. module: crm_helpdesk
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
@@ -520,38 +526,38 @@ msgstr ""
#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
msgid "Helpdesk"
msgstr ""
msgstr "Helpdesk"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: field:crm.helpdesk,user_id:0
msgid "Responsible"
msgstr ""
msgstr "Verantwoordelijke"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Current"
msgstr ""
msgstr "Actueel"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Details"
msgstr ""
msgstr "Details"
#. module: crm_helpdesk
#: field:crm.helpdesk,description:0
msgid "Description"
msgstr ""
msgstr "Omschrijving"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "May"
msgstr ""
msgstr "Mei"
#. module: crm_helpdesk
#: field:crm.helpdesk,probability:0
msgid "Probability (%)"
msgstr ""
msgstr "Waarschijnlijkheid (%)"
#. module: crm_helpdesk
#: help:crm.helpdesk,canal_id:0
@@ -559,11 +565,13 @@ msgid ""
"The channels represent the different communication modes available with the "
"customer."
msgstr ""
"De kanalen geven de verschillende beschikbare communicatievormen met de "
"klant weer."
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "This Month"
msgstr ""
msgstr "Deze maand"
#. module: crm_helpdesk
#: help:crm.helpdesk,state:0
@@ -576,76 +584,84 @@ msgid ""
" \n"
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
"De status wordt op 'Concept' gezet als de aanvraag wordt gemaakt. "
" \n"
"Als de aanvraag in behandeling is, wordt de status op 'Open' gezet. "
" \n"
"Als de aanvraag klaar is, gaat de status naar 'Gereed'. "
" \n"
"Als de aanvraag moet worden onderzocht, wordt de status op 'Behandeling' "
"gezet."
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "February"
msgstr ""
msgstr "Februari"
#. module: crm_helpdesk
#: field:crm.helpdesk,name:0
msgid "Name"
msgstr ""
msgstr "Naam"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Lost"
msgstr ""
msgstr "Verloren"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "Communication history"
msgstr ""
msgstr "Communicatiegeschiedenis"
#. module: crm_helpdesk
#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
msgid "Helpdesk and Support"
msgstr ""
msgstr "Helpdesk en ondersteuning"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
msgid "April"
msgstr ""
msgstr "April"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
msgid "References"
msgstr ""
msgstr "Verwijzingen"
#. module: crm_helpdesk
#: field:crm.helpdesk,id:0
msgid "ID"
msgstr ""
msgstr "ID"
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
#: selection:crm.helpdesk.report,priority:0
msgid "High"
msgstr ""
msgstr "Hoog"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: field:crm.helpdesk,section_id:0
msgid "Sales Team"
msgstr ""
msgstr "Verkoopteam"
#. module: crm_helpdesk
#: field:crm.helpdesk.report,create_date:0
msgid "Create Date"
msgstr ""
msgstr "Aanmaakdatum"
#. module: crm_helpdesk
#: field:crm.helpdesk,date_action_last:0
msgid "Last Action"
msgstr ""
msgstr "Laatste actie"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,name:0
msgid "Year"
msgstr ""
msgstr "Jaar"
#. module: crm_helpdesk
#: field:crm.helpdesk,duration:0
msgid "Duration"
msgstr ""
msgstr "Duur"
addons/decimal_precision/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 05:24+0000\n"
"PO-Revision-Date: 2010-10-10 10:48+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:17+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: decimal_precision
addons/delivery/wizard/delivery_sale_order_view.xml
+14 -14
View File
@@ -4,27 +4,27 @@
<!-- Delivery Sale Order -->
<record id="view_make_delivery_wizard" model="ir.ui.view">
<record id="view_make_delivery_wizard" model="ir.ui.view">
<field name="name">Delivery Costs</field>
<field name="model">delivery.sale.order</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Deliveries">
<separator colspan="4" string="Delivery Method" />
<field name="carrier_id" widget="selection"/>
<newline/>
<separator colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel"
string="_Cancel" />
<button name="delivery_set" string="_Apply"
colspan="1" type="object" icon="gtk-apply" />
</group>
<separator colspan="4" string="Delivery Method" />
<field name="carrier_id" widget="selection"/>
<newline/>
<separator colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel"
string="_Cancel" />
<button name="delivery_set" string="_Apply"
colspan="1" type="object" icon="gtk-apply" />
</group>
</form>
</field>
</record>
<record id="action_delivery_cost" model="ir.actions.act_window">
<record id="action_delivery_cost" model="ir.actions.act_window">
<field name="name">Delivery Costs</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">delivery.sale.order</field>
@@ -34,5 +34,5 @@
<field name="target">new</field>
</record>
</data>
</openerp>
</data>
</openerp>
addons/hr_payroll/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-25 13:16+0000\n"
"PO-Revision-Date: 2010-10-10 11:08+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:18+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_payroll
addons/mrp/test/mrp_procurement.yml
+3 -3
View File
@@ -177,7 +177,7 @@
purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
I confirm purchase order for Buttons.
@@ -187,7 +187,7 @@
purch_ids = self.search(cr, uid, [('partner_id.name','=','ASUStek')])
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
-
I Check incoming shipments for cloth. And receive products.
@@ -284,7 +284,7 @@
assert prod_ids, _('No Ready Manufacturing Orders found!')
wf_service = netsvc.LocalService("workflow")
for p_id in prod_ids:
wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
-
I create record for producing products with quantity 5.00.
-
addons/point_of_sale/i18n/sr.po
+156 -155
View File
File diff suppressed because it is too large Load Diff
addons/procurement/procurement.py
+1 -5
View File
@@ -322,7 +322,7 @@ class procurement_order(osv.osv):
if procurement.procure_method == 'make_to_order':
source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
id = move_obj.create(cr, uid, {
'name': 'PROC:' + procurement.name,
'name': procurement.name,
'location_id': source,
'location_dest_id': procurement.location_id.id,
'product_id': procurement.product_id.id,
@@ -374,10 +374,6 @@ class procurement_order(osv.osv):
"Not enough stock and no minimum orderpoint rule defined.") % \
procurement.name
self.log(cr, uid, procurement.id, message)
if procurement.state=='exception' and procurement.message=='':
cr.execute('update procurement_order set message=%s where id=%s',
(_('Not enough stock '), procurement.id) )
return ok
def action_produce_assign_service(self, cr, uid, ids, context={}):
addons/procurement/schedulers.py
+3 -3
View File
@@ -170,8 +170,8 @@ class procurement_order(osv.osv):
else:
continue
proc_id = proc_obj.create(cr, uid, {
'name': 'Automatic OP: %s' % product.name,
'origin': 'SCHEDULER',
'name': _('Automatic OP: %s') % (product.name,),
'origin': _('SCHEDULER'),
'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
'product_id': product.id,
'product_qty': -product.virtual_available,
@@ -236,7 +236,7 @@ class procurement_order(osv.osv):
continue
if op.product_id.type not in ('consu'):
proc_id = procurement_obj.create(cr, uid, {
'name': 'OP:' + str(op.id),
'name': op.name,
'date_planned': newdate.strftime('%Y-%m-%d'),
'product_id': op.product_id.id,
'product_qty': qty,
addons/product/product.py
+1 -1
View File
@@ -386,7 +386,7 @@ class product_product(osv.osv):
def _get_partner_code_name(self, cr, uid, ids, product, partner_id, context={}):
for supinfo in product.seller_ids:
if supinfo.name.id == partner_id:
return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}
return {'code': supinfo.product_code or product.default_code, 'name': supinfo.product_name or product.name, 'variants': ''}
res = {'code': product.default_code, 'name': product.name, 'variants': product.variants}
return res
addons/product/product_view.xml
-1
View File
@@ -197,7 +197,6 @@
<field name="search_view_id" ref="product_search_form_view"/>
<field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
</record>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,group_product_manager"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman,base.group_system"/>
<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,group_product_manager"/>
addons/purchase/i18n/de.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-10-10 10:52+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:17+0000\n"
"Last-Translator: Ferdinand-chricar <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: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
addons/purchase/purchase_demo.xml
+6 -9
View File
@@ -3,19 +3,17 @@
<data noupdate="1">
<!--Resource: purchase.order-->
<record id="order_purchase1" model="purchase.order">
<record id="order_purchase1" model="purchase.order">
<field model="stock.location" name="location_id" search="[]"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
<field name="user_id" ref="base.user_root"/>
<field model="res.partner" name="partner_id" search="[]"/>
<field model="res.partner.address" name="partner_address_id" search="[]"/>
</record>
<record id="order_purchase2" model="purchase.order">
</record>
<record id="order_purchase2" model="purchase.order">
<field model="stock.location" name="location_id" search="[]"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
<field name="user_id" ref="base.user_demo"/>
<field model="res.partner" name="partner_id" search="[]"/>
<field model="res.partner.address" name="partner_address_id" search="[]"/>
</record>
@@ -30,7 +28,6 @@
<field model="product.uom" name="product_uom" search="[]"/>
<field name="price_unit">150</field>
<field name="product_qty">5</field>
<field name="type">make_to_stock</field>
</record>
<record id="line2_purchase" model="purchase.order.line">
@@ -57,4 +54,4 @@
</data>
</openerp>
addons/purchase_requisition/test/purchase_requisition.yml
+1 -1
View File
@@ -127,7 +127,7 @@
-
!python {model: stock.picking }: |
from tools.translate import _
picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
if picking_id:
pick=self.browse(cr,uid,picking_id[0])
assert (pick.state =='confirmed'),_('Picking is not in confirm state.')
addons/resource/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-18 06:50+0000\n"
"PO-Revision-Date: 2010-10-10 10:52+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:17+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: resource
addons/resource/i18n/nl.po
+341
View File
@@ -0,0 +1,341 @@
# Dutch translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-18 06:50+0000\n"
"PO-Revision-Date: 2010-10-11 12:36+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
msgid ""
"If empty, this is a generic holiday for the company. If a resource is set, "
"the holiday/leave is only for this resource"
msgstr ""
"Indien leeg, dan is dit een algemene vrije dag voor het bedrijf. Als de "
"resource is gevuld dan geldt de afwezigheid alleen voor deze resource."
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Friday"
msgstr "Vrijdag"
#. module: resource
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
#. module: resource
#: field:resource.resource,resource_type:0
msgid "Resource Type"
msgstr "Soort resource"
#. module: resource
#: model:ir.model,name:resource.model_resource_calendar_leaves
#: view:resource.calendar.leaves:0
msgid "Leave Detail"
msgstr "Afwezigheiddetail"
#. module: resource
#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
msgid "Resources Leaves"
msgstr "Afwezigheid resource"
#. module: resource
#: field:resource.calendar,attendance_ids:0
#: view:resource.calendar.attendance:0
#: view:resource.calendar.leaves:0
msgid "Working Time"
msgstr "Gewerkte tijd"
#. module: resource
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Ongeldige XML voor weergave opbouw!"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Thursday"
msgstr "Donderdag"
#. module: resource
#: view:resource.calendar:0
#: view:resource.calendar.leaves:0
#: view:resource.resource:0
msgid "Group By..."
msgstr "Groepeer op.."
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Sunday"
msgstr "Zondag"
#. module: resource
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: resource
#: view:resource.resource:0
msgid "Search Resource"
msgstr "Zoek resource"
#. module: resource
#: view:resource.resource:0
msgid "Type"
msgstr "Soort"
#. module: resource
#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
#: view:resource.resource:0
msgid "Resources"
msgstr "Resources"
#. module: resource
#: field:resource.calendar,manager:0
msgid "Workgroup manager"
msgstr "Manager"
#. module: resource
#: view:resource.calendar:0
msgid "Search Working Period"
msgstr "Zoek werkperiode"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Monday"
msgstr "Maandag"
#. module: resource
#: model:ir.model,name:resource.model_resource_calendar
msgid "Resource Calendar"
msgstr "Resource agenda"
#. module: resource
#: field:resource.calendar,company_id:0
#: view:resource.calendar.leaves:0
#: field:resource.calendar.leaves,company_id:0
#: view:resource.resource:0
#: field:resource.resource,company_id:0
msgid "Company"
msgstr "Bedrijf"
#. module: resource
#: selection:resource.resource,resource_type:0
msgid "Material"
msgstr "Materiaal"
#. module: resource
#: field:resource.calendar.attendance,dayofweek:0
msgid "Day of week"
msgstr "Dag v/d week"
#. module: resource
#: field:resource.calendar.attendance,date_from:0
msgid "Starting date"
msgstr "Startdatum"
#. module: resource
#: view:resource.resource:0
#: field:resource.resource,user_id:0
msgid "User"
msgstr "Gebruiker"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Date"
msgstr "Datum"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Search Working Period Leaves"
msgstr "Zoek afwezigheid werkperiode"
#. module: resource
#: field:resource.calendar.leaves,date_to:0
msgid "End Date"
msgstr "Einddatum"
#. module: resource
#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
msgid "Closing Days"
msgstr "Dagen gesloten"
#. module: resource
#: model:ir.module.module,shortdesc:resource.module_meta_information
#: view:resource.calendar.leaves:0
#: field:resource.calendar.leaves,resource_id:0
#: view:resource.resource:0
msgid "Resource"
msgstr "Resource"
#. module: resource
#: view:resource.calendar:0
#: field:resource.calendar,name:0
#: field:resource.calendar.attendance,name:0
#: view:resource.calendar.leaves:0
#: field:resource.calendar.leaves,name:0
#: field:resource.resource,name:0
msgid "Name"
msgstr "Naam"
#. module: resource
#: model:ir.module.module,description:resource.module_meta_information
msgid ""
"\n"
" Module for resource management\n"
" A resource represent something that can be scheduled\n"
" (a developer on a task or a workcenter on manufacturing orders).\n"
" This module manages a resource calendar associated to every resource.\n"
" It also manages the leaves of every resource.\n"
"\n"
" "
msgstr ""
"\n"
" Module voor resource beheer\n"
" Een resource vertegenwoordigt iets dat kan worden gepland\n"
" (een ontwikkelaar op een taak, een bewerkingsplaats op "
"productieorders).\n"
" Deze module beheert een resource agenda gekoppeld aan elke resource.\n"
" Het beheert ook de afwezigheid van elke resource.\n"
"\n"
" "
#. module: resource
#: help:resource.resource,active:0
msgid ""
"If the active field is set to true, it will allow you to hide the resource "
"record without removing it."
msgstr ""
"Als het actief veld is aan staat, kunt u de resource verbergen zonder haar "
"te verwijderen."
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Wednesday"
msgstr "Woensdag"
#. module: resource
#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
#: view:resource.calendar:0
msgid "Working Period"
msgstr "Werkperiode"
#. module: resource
#: model:ir.model,name:resource.model_resource_resource
msgid "Resource Detail"
msgstr "Resource detail"
#. module: resource
#: field:resource.resource,active:0
msgid "Active"
msgstr "Actief"
#. module: resource
#: field:resource.calendar.attendance,calendar_id:0
msgid "Resource's Calendar"
msgstr "Resource's agenda"
#. module: resource
#: help:resource.resource,user_id:0
msgid "Related user name for the resource to manage its access."
msgstr ""
"Gekoppelde gebruikersnaam voor de resource om van haar toegang te beheren."
#. module: resource
#: help:resource.resource,calendar_id:0
msgid "Define the schedule of resource"
msgstr "Definieert de planning van de resource"
#. module: resource
#: field:resource.calendar.attendance,hour_from:0
msgid "Work from"
msgstr "Werk vanaf"
#. module: resource
#: field:resource.resource,code:0
msgid "Code"
msgstr "Code"
#. module: resource
#: field:resource.calendar.attendance,hour_to:0
msgid "Work to"
msgstr "Werk tot"
#. module: resource
#: help:resource.resource,time_efficiency:0
msgid ""
"This field depict the efficiency of the resource to complete tasks. e.g "
"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
"show a load of 100% for this phase by default, but if we put a efficency of "
"200%, then his load will only be 50%."
msgstr ""
"Dit veld toont de efficiency van de resource om taken te voltooien. bijv. "
"resource alleen gedurende 5 dagen met 5 toegewezen taken zal standaard 100% "
"belasting tonen, maar als we de efficiency op 200% zetten, dan zal zijn "
"belasting slechts 50% zijn."
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Tuesday"
msgstr "Dinsdag"
#. module: resource
#: field:resource.calendar.leaves,calendar_id:0
#: field:resource.resource,calendar_id:0
msgid "Working time"
msgstr "Werktijd"
#. module: resource
#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
msgid "Resource Leaves"
msgstr "Afwezigheid resource"
#. module: resource
#: view:resource.calendar:0
msgid "Manager"
msgstr "Manager"
#. module: resource
#: code:addons/resource/faces/resource.py:0
#, python-format
msgid "(vacation)"
msgstr "(vakantie)"
#. module: resource
#: field:resource.resource,time_efficiency:0
msgid "Efficiency factor"
msgstr "Efficiency factor"
#. module: resource
#: selection:resource.resource,resource_type:0
msgid "Human"
msgstr "Persoon"
#. module: resource
#: model:ir.model,name:resource.model_resource_calendar_attendance
msgid "Work Detail"
msgstr "Werk detail"
#. module: resource
#: field:resource.calendar.leaves,date_from:0
msgid "Start Date"
msgstr "Startdatum"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Saturday"
msgstr "Zaterdag"
addons/sale/board_sale_view.xml
+2 -3
View File
@@ -33,8 +33,7 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_sales_manager_form"/>
</record>
<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_sales_manager"/>
</data>
</openerp>
</openerp>
addons/sale/process/sale_process.xml
-1
View File
@@ -85,7 +85,6 @@
</record>
<record id="process_node_deliveryorder0" model="process.node">
<field name="menu_id" ref="stock.menu_action_picking_tree_delivery"/>
<field name="model_id" ref="stock.model_stock_picking"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
addons/sale/sale.py
-5
View File
@@ -1234,11 +1234,6 @@ class sale_config_picking_policy(osv.osv_memory):
ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
if o.step == 'one':
md = self.pool.get('ir.model.data')
group_id = md._get_id(cr, uid, 'base', 'group_no_one')
group_id = md.browse(cr, uid, group_id, context=context).res_id
menu_id = md._get_id(cr, uid, 'stock', 'menu_action_picking_tree_delivery')
menu_id = md.browse(cr, uid, menu_id, context=context).res_id
self.pool.get('ir.ui.menu').write(cr, uid, [menu_id], {'groups_id': [(6, 0, [group_id])]})
location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
location_id = md.browse(cr, uid, location_id, context=context).res_id
self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
addons/sale/sale_data.xml
+4 -4
View File
@@ -2,16 +2,16 @@
<openerp>
<data noupdate="1">
<!--
Requests Links
-->
Requests Links
-->
<record id="req_link_sale_order" model="res.request.link">
<field name="name">Sale Order</field>
<field name="object">sale.order</field>
</record>
<!--
Resource: sale.shop
-->
Resource: sale.shop
-->
<record id="shop" model="sale.shop">
<field model="res.company" name="name" search="[]" use="name"/>
<field model="stock.warehouse" name="warehouse_id" search="[]"/>
addons/sale/sale_view.xml
+17 -16
View File
@@ -2,7 +2,8 @@
<openerp>
<data>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager"/>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
@@ -375,22 +376,22 @@ to your configuration: from the sales order, from the pickings, etc.
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sales Order Lines">
<group colspan="4" col="6">
<field name="order_id"/>
<field name="product_id" readonly="1"/>
<field name="invoiced"/>
<field name="product_uom_qty" readonly="1"/>
<field groups="product.group_uos" name="product_uos_qty"/>
<field name="product_uom"/>
<field colspan="4" name="name" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="order_partner_id" readonly="1" invisible="1"/>
</group>
<group colspan="4" col="6">
<field name="order_id"/>
<field name="product_id" readonly="1"/>
<field name="invoiced"/>
<field name="product_uom_qty" readonly="1"/>
<field groups="product.group_uos" name="product_uos_qty"/>
<field name="product_uom"/>
<field colspan="4" name="name" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="order_partner_id" readonly="1" invisible="1"/>
</group>
<separator colspan="4" string="Price"/>
<group colspan="4" col="6">
<field name="price_unit"/>
<field name="discount"/>
<field name="price_subtotal"/>
<field name="price_unit"/>
<field name="discount"/>
<field name="price_subtotal"/>
</group>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/>
@@ -518,7 +519,7 @@ to your configuration: from the sales order, from the pickings, etc.
groups="base.group_extended"/>
<menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"
groups="base.group_extended"/>
groups="base.group_extended"/>
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
<!-- configartion view -->
addons/sale/test/manual_order_policy.yml
+3 -3
View File
@@ -110,7 +110,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
assert (picking_id),"Delivery order has not been generated"
-
I verify that a procurement has been generated for so
@@ -282,7 +282,7 @@
import time
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
if picking_id:
pick=self.browse(cr,uid,picking_id[0])
pick.force_assign(cr, uid)
@@ -304,7 +304,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
pick = self.browse(cr,uid,picking_id[0])
assert (pick.state) =='done', "Picking for SO is not in done state."
-
addons/sale/test/picking_order_policy.yml
+3 -3
View File
@@ -261,7 +261,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
assert (picking_id),"Delivery order has not been generated"
-
I verify that delivery has been done
@@ -270,7 +270,7 @@
import time
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
if picking_id:
pick=self.browse(cr,uid,picking_id[0])
pick.force_assign(cr, uid)
@@ -292,7 +292,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
if picking_id:
pick = self.browse(cr,uid,picking_id[0])
assert (pick.state) =='done', "Picking for SO is not in done state."
addons/sale/test/postpaid_order_policy.yml
+3 -3
View File
@@ -73,7 +73,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
assert (picking_id),"Delivery order has not been generated"
-
I click on the Products Sent button and then on the Validate button
@@ -82,7 +82,7 @@
import time
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
if picking_id:
pick=self.browse(cr,uid,picking_id[0])
pick.force_assign(cr, uid)
@@ -104,7 +104,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
picking_id = self.search(cr, uid, [('origin','=',so.name)])
if picking_id:
pick = self.browse(cr,uid,picking_id[0])
assert (pick.state) =='done', "Picking for SO is not in done state."
addons/sale/test/prepaid_order_policy.yml
+1 -1
View File
@@ -40,7 +40,7 @@
!python {model: stock.picking }: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
picking_id = self.search(cr, uid, [('origin','!=',so.name),(('type','=','out')and('type','=','delivery'))])
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
assert picking_id,"There is a picking attached to this sale order"
-
I open the Invoice for the SO.
addons/sale/test/so_make_invoice.yml
+1 -1
View File
@@ -110,7 +110,7 @@
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
pick_obj = self.pool.get('stock.picking')
pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name),('type','=','delivery')])
pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name)])
pick_brw = pick_obj.browse(cr,uid,pick_id)[0]
move_obj = self.pool.get('stock.move')
move_id = move_obj.search(cr, uid, [('picking_id', '=', pick_brw.name),('name','=','LG Viewty Smart')])
addons/sale_journal/sale_journal_view.xml
-44
View File
@@ -213,38 +213,6 @@
</field>
</record>
<!-- Inherit stock picking delivery's form view.-->
<record model="ir.ui.view" id="sale_journal_picking_order_del">
<field name="name">stock.picking.journal.view.form</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_delivery_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="journal_id" select="1"/>
<field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
</field>
</field>
</record>
<!-- Inherit stock picking delivery's tree view.-->
<record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
<field name="name">stock.picking.journal.view.tree</field>
<field name="type">tree</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_delivery_tree" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="sale_journal_id" select="1"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="sale_journal_picking_order_in">
<field name="name">stock.picking.journal.view.form</field>
<field name="type">form</field>
@@ -487,18 +455,6 @@
<field name="object" eval="True"/>
</record>
<record id="view_picking_delivery_jorunal_search_form" model="ir.ui.view">
<field name="name">stock.picking.journal.search</field>
<field name="model">stock.picking</field>
<field name="type">search</field>
<field name="inherit_id" ref="stock.view_stock_delivery_filter"/>
<field name="arch" type="xml">
<xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</xpath>
</field>
</record>
<record id="view_picking_out_jorunal_search_form" model="ir.ui.view">
<field name="name">stock.picking.journal.search</field>
<field name="model">stock.picking</field>
addons/stock/report/report_stock_move.py
+3 -3
View File
@@ -39,7 +39,7 @@ class report_stock_move(osv.osv):
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
@@ -85,7 +85,7 @@ class report_stock_move(osv.osv):
al.stock_journal as stock_journal,
sum(al.in_value - al.out_value) as value
FROM (SELECT
CASE WHEN sp.type in ('out','delivery') THEN
CASE WHEN sp.type in ('out') THEN
sum(sm.product_qty * pu.factor)
ELSE 0.0
END AS out_qty,
@@ -93,7 +93,7 @@ class report_stock_move(osv.osv):
sum(sm.product_qty * pu.factor)
ELSE 0.0
END AS in_qty,
CASE WHEN sp.type in ('out','delivery') THEN
CASE WHEN sp.type in ('out') THEN
sum(sm.product_qty * pu.factor) * pt.standard_price
ELSE 0.0
END AS out_value,
addons/stock/report/report_stock_move_view.xml
-1
View File
@@ -96,7 +96,6 @@
<filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
<filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
<filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
<filter icon="terp-go-home" name="delivery" string="Deliveries" domain="[('type','=','delivery')]"/>
<separator orientation="vertical"/>
<field name="product_id" default_focus="1"/>
<field name="partner_id" context="{'contact_display':'partner'}"/>
addons/stock/stock.py
+18 -15
View File
@@ -186,7 +186,7 @@ class stock_location(osv.osv):
"validated automatically. With 'Manual Operation', the stock move has to be validated "\
"by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
),
'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
'address_id': fields.many2one('res.partner.address', 'Location Address',help="Address of customer or supplier."),
@@ -242,7 +242,7 @@ class stock_location(osv.osv):
"""
result = 'internal'
if (from_location.usage=='internal') and (to_location and to_location.usage in ('customer', 'supplier')):
result = 'delivery'
result = 'out'
elif (from_location.usage in ('supplier', 'customer')) and (to_location.usage == 'internal'):
result = 'in'
return result
@@ -602,7 +602,7 @@ class stock_picking(osv.osv):
'name': fields.char('Reference', size=64, select=True),
'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking.", select=True),
'backorder_id': fields.many2one('stock.picking', 'Back Order of', help="If this picking was split this field links to the picking that contains the other part that has been processed already.", select=True),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes'),
'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True),
'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
@@ -1251,7 +1251,6 @@ class stock_picking(osv.osv):
'out':'Picking List',
'in':'Reception',
'internal': 'Internal picking',
'delivery': 'Delivery order'
}
message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
if pick.min_date:
@@ -1652,10 +1651,20 @@ class stock_move(osv.osv):
)
if dest:
if dest[1] == 'transparent':
newdate = (datetime.strptime(m.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d')
self.write(cr, uid, [m.id], {
'date': (datetime.strptime(m.date, '%Y-%m-%d %H:%M:%S') + \
relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d'),
'date': newdate,
'location_dest_id': dest[0].id})
if m.picking_id and (dest[3] or dest[5]):
self.pool.get('stock.picking').write(cr, uid, [m.picking_id.id], {
'stock_journal_id': dest[3] or m.picking_id.stock_journal_id.id,
'type': dest[5] or m.picking_id.type
}, context=context)
m.location_dest_id = dest[0]
res2 = self._chain_compute(cr, uid, [m], context=context)
for pick_id in res2.keys():
result.setdefault(pick_id, [])
result[pick_id] += res2[pick_id]
else:
result.setdefault(m.picking_id, [])
result[m.picking_id].append( (m, dest) )
@@ -1695,16 +1704,10 @@ class stock_move(osv.osv):
for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
pick_name = picking.name or ''
if ptype == 'delivery':
pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
check_picking_ids = picking_obj.search(cr, uid, [('name','=',picking.name),('origin','=',str(picking.origin or '')),('type','=',ptype),('move_type','=',picking.move_type)])
if check_picking_ids:
pickid = check_picking_ids[0]
if picking:
pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
else:
if picking:
pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
else:
pickid = False
pickid = False
for move, (loc, auto, delay, journal, company_id, ptype) in todo:
new_id = move_obj.copy(cr, uid, move.id, {
'location_id': move.location_dest_id.id,
addons/stock/stock_data.xml
+6
View File
@@ -74,11 +74,17 @@
<field name="usage">view</field>
<field name="location_id" ref="stock_location_locations"/>
</record>
<record id="journal_delivery" model="stock.journal">
<field name="name">Delivery Orders</field>
</record>
<record id="stock_location_output" model="stock.location">
<field name="name">Output</field>
<field name="location_id" ref="stock_location_company"/>
<field name="usage">internal</field>
<field name="chained_location_type">customer</field>
<field name="chained_picking_type">out</field>
<field name="chained_journal_id" ref="journal_delivery"/>
</record>
<record id="stock_location_stock" model="stock.location">
<field name="name">Stock</field>
addons/stock/stock_demo.xml
+16 -28
View File
@@ -3,8 +3,8 @@
<data noupdate="1">
<!--
Resource: stock.location
-->
Resource: stock.location
-->
<record id="stock_location_3" model="stock.location">
<field name="name">IT Suppliers</field>
<field name="location_id" ref="stock_location_suppliers"/>
@@ -30,30 +30,18 @@
<field name="location_id" ref="stock_location_customers"/>
<field name="usage">customer</field>
</record>
<record id="stock_location_13" model="stock.location">
<field name="name">Stock Level 1</field>
<field name="location_id" ref="stock_location_stock"/>
</record>
<record id="stock_location_14" model="stock.location">
<field name="name">Shelf 2</field>
<field name="location_id" ref="stock_location_13"/>
</record>
<record id="stock_location_15" model="stock.location">
<field name="name">Sub Products</field>
<field name="location_id" ref="stock_location_13"/>
</record>
<record id="stock_location_workshop" model="stock.location">
<field name="name">Workshop</field>
<field name="location_id" ref="stock_location_stock"/>
</record>
<record id="stock_location_components" model="stock.location">
<field name="name">Shelf 1</field>
<field name="location_id" ref="stock_location_workshop"/>
<field name="location_id" ref="stock_location_stock"/>
</record>
<!--
Resource: stock.inventory
-->
Resource: stock.inventory
-->
<record id="stock_inventory_0" model="stock.inventory">
<field name="name">Starting Inventory</field>
@@ -62,8 +50,8 @@
</record>
<!--
Resource: stock.inventory.line
-->
Resource: stock.inventory.line
-->
<record id="stock_inventory_line_0" model="stock.inventory.line">
<field name="product_id" ref="product.product_product_pc1"/>
@@ -189,7 +177,7 @@
<field eval="0" name="customer"/>
<field eval="0" name="supplier"/>
<field eval="1" name="active"/>
<field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
</record>
<record id="res_partner_address_fabien0" model="res.partner.address">
<field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
@@ -206,7 +194,7 @@
<field eval="1" name="customer"/>
<field eval="0" name="supplier"/>
<field eval="1" name="active"/>
<field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
</record>
<record id="res_partner_address_eric0" model="res.partner.address">
<field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
@@ -223,7 +211,7 @@
</record>
<record id="stock_location_shop0" model="stock.location">
<field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
<field name="location_id" ref="stock.stock_location_company"/>
<field name="location_id" ref="stock.stock_location_locations"/>
<field name="company_id" ref="res_company_shop0"/>
<field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
<field eval="&quot;&quot;&quot;none&quot;&quot;&quot;" name="chained_location_type"/>
@@ -234,14 +222,14 @@
<record id="stock_location_shop1" model="stock.location">
<field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
<field name="company_id" ref="res_company_tinyshop0"/>
<field name="location_id" ref="stock.stock_location_company"/>
<field name="location_id" ref="stock.stock_location_locations"/>
<field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
<field eval="1" name="active"/>
<field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
</record>
<record id="stock_location_intermediatelocation0" model="stock.location">
<field name="address_id" ref="base.main_address"/>
<field name="location_id" ref="stock.stock_location_company"/>
<field name="location_id" ref="stock.stock_location_locations_partner"/>
<field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/>
<field eval="&quot;&quot;&quot;Internal Shippings&quot;&quot;&quot;" name="name"/>
</record>
@@ -263,13 +251,13 @@
<field name="lot_input_id" ref="stock_location_shop1"/>
</record>
<record forcecreate="True" id="property_stock_variation" model="ir.property">
<record forcecreate="True" id="property_stock_variation" model="ir.property">
<field name="name">property_stock_variation</field>
<field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_variation')]"/>
<field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
<field name="company_id" ref="base.main_company"/>
<field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record id="stock_picking_1" model="stock.picking">
<record id="stock_picking_1" model="stock.picking">
<field name="name">PACKO1</field>
<field name="type">out</field>
<field name="move_type">direct</field>
addons/stock/stock_sequence.xml
+3 -15
View File
@@ -20,14 +20,9 @@
<field name="code">stock.picking.internal</field>
</record>
<record id="seq_type_picking_delivery" model="ir.sequence.type">
<field name="name">Picking Delivery</field>
<field name="code">stock.picking.delivery</field>
</record>
<!--
Sequences for pickings
-->
<!--
Sequences for pickings
-->
<record id="seq_picking_in" model="ir.sequence">
<field name="name">Picking IN</field>
@@ -50,13 +45,6 @@
<field name="padding">5</field>
</record>
<record id="seq_picking_delivery" model="ir.sequence">
<field name="name">Picking DLV</field>
<field name="code">stock.picking.delivery</field>
<field name="prefix">DLV/</field>
<field name="padding">5</field>
</record>
<!--
Sequences from tracking numbers
-->
addons/stock/stock_view.xml
+1 -221
View File
@@ -652,7 +652,6 @@
<page string="Products">
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
<tree colors="grey:scrapped == True" string="Stock Moves">
<field name="name" string="Move Name"/>
<field name="product_id"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="UoM"/>
@@ -682,7 +681,6 @@
states="draft,assigned,confirmed,done"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="date"/>
<field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
@@ -798,224 +796,6 @@
</field>
</record>
<record id="view_picking_delivery_tree" model="ir.ui.view">
<field name="name">stock.picking.delivery.tree</field>
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
<field name="name"/>
<field name="partner_id"/>
<field name="backorder_id" groups="base.group_extended"/>
<field name="origin"/>
<field name="date"/>
<field name="min_date"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
<field name="state"/>
<button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the delivery. Do you want to continue?"/>
</tree>
</field>
</record>
<record id="view_picking_delivery_form" model="ir.ui.view">
<field name="name">stock.picking.delivery.form</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Delivery Picking list">
<group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}">
<group colspan="4" col="4">
<field name="name" readonly="1"/>
<field name="origin" readonly="1"/>
<field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
<field name="invoice_state"/>
<field name="backorder_id" readonly="1" groups="base.group_extended"/>
</group>
<group colspan="2" col="2">
<field name="date"/>
<field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
</group>
<notebook colspan="4">
<page string="Products">
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
<tree colors="grey:scrapped == True" string="Stock Moves">
<field name="name" string="Move Name"/>
<field name="product_id"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="UoM"/>
<field name="product_uos" groups="product.product_uos"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"
groups="base.group_extended"/>
<field name="scrapped" invisible="1"/>
<field name="prodlot_id" groups="base.group_extended"/>
<button
name="%(stock.track_line)d"
string="Split in production lots"
type="action" icon="terp-stock_effects-object-colorize"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned" />
<field groups="base.group_extended" name="tracking_id"/>
<button name="setlast_tracking" string="Put in current pack" type="object"
attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"
groups="base.group_extended"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<field name="date"/>
<field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
<form string="Stock Moves">
<group colspan="2" col="4">
<separator colspan="2" string="Move Information"/>
<field name="name" invisible="1" colspan="4"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
<button name="%(stock.move_scrap)d"
string="Scrap" type="action" groups="base.group_extended"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
<field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
<field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
<field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
<field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
</group>
<group colspan="2" col="2">
<separator string="Locations" colspan="2" />
<field name="location_id" domain="[('usage','=','internal')]" />
<field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
</group>
<group colspan="2" col="2">
<separator string="Dates" colspan="2" />
<field name="create_date" invisible="1"/>
<field name="date"/>
<field name="date_expected"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
<separator string="Traceability" colspan="4" groups="base.group_extended"/>
<field name="tracking_id" groups="base.group_extended" colspan="3"/>
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)" colspan="3"/>
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned,done"
string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
</group>
<label string="" colspan="4"/>
<field name="state"/>
<group col="4" colspan="2">
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
<group col="10" colspan="4">
<field name="state" readonly="1"/>
<button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
<field name="auto_picking" groups="base.group_extended"/>
<field name="date_done" groups="base.group_extended"/>
<field name="move_type" groups="base.group_extended"/>
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record id="view_stock_delivery_filter" model="ir.ui.view">
<field name="name">stock.view_stock_delivery_filter.list.select</field>
<field name="model">stock.picking</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Stock Delivery">
<group col="10" colspan="4">
<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="partner_id"/>
<field name="origin"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="10">
<filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical" />
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" />
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
<separator orientation="vertical" />
<filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
</group>
</search>
</field>
</record>
<record id="action_picking_tree_delivery" model="ir.actions.act_window">
<field name="name">Delivery Orders</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','delivery')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="search_view_id" ref="view_stock_delivery_filter"/>
</record>
<record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_picking_delivery_tree"/>
<field name="act_window_id" ref="action_picking_tree_delivery"/>
</record>
<record id="action_picking_tree_delivery_view2" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="view_picking_delivery_form"/>
<field name="act_window_id" ref="action_picking_tree_delivery"/>
</record>
<record id="action_picking_tree_delivery_view2_calendar" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">calendar</field>
<field name="act_window_id" ref="action_picking_tree_delivery"/>
</record>
<menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="7"/>
<!--
#
# Sending Products
@@ -1486,7 +1266,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','internal')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_confirmed":1}</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="search_view_id" ref="view_picking_internal_search"/>
</record>
addons/stock/test/stock_report.yml
+1 -1
View File
@@ -3,7 +3,7 @@
-
!python {model: stock.location}: |
import netsvc, tools, os
(data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
(data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_stock')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
-
addons/stock/wizard/stock_partial_move.py
+1 -1
View File
@@ -38,7 +38,7 @@ class stock_partial_move(osv.osv_memory):
context={}
for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
if m.state in ('done', 'cancel'):
raise osv.except_osv(_('Invalid action !'), _('Cannot delivery products which are already delivered !'))
raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
if 'move%s_product_id'%(m.id) not in self._columns:
addons/stock/wizard/stock_partial_picking.py
+1 -1
View File
@@ -63,7 +63,7 @@ class stock_partial_picking(osv.osv_memory):
_moves_arch_lst = """<form string="Deliver Products">
<separator colspan="4" string="Delivery Information"/>
<group colspan="4" col="4">
<field name="date"/>
<field name="date"/>
</group>
<separator colspan="4" string="Move Detail"/>
"""
addons/stock_location/__openerp__.py
+18 -8
View File
@@ -74,19 +74,29 @@ Technically, Pull flows allow to process procurement orders differently, not onl
the product being considered, but also depending on which location holds the "need" for that
product (i.e. the destination location of that procurement order).
Use-Case
--------
You can use the demo data as follow:
CPU1: Sell some CPU1 from Shop 1 and run the scheduler
- Warehouse: delivery order, Shop 1: reception
CPU3:
- When receiving the product, it goes to Quality Control location then stored to shelf 2.
- When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A
""",
'author': 'OpenERP SA',
'depends': ['procurement','stock'],
'depends': ['procurement','stock','sale'],
'init_xml': [],
'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
'demo_xml': ['stock_location_demo.xml',],
'demo_xml': [
'stock_location_demo_cpu1.xml',
'stock_location_demo_cpu3.yml',
],
'installable': True,
'test':[''
'test/stock_location_pull_flow.yml',
'test/stock_location_push_flow.yml',
],
'test':[
# 'test/stock_location_pull_flow.yml',
# 'test/stock_location_push_flow.yml',
],
'active': False,
'certificate': '0046505115101',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/stock_location/stock_location.py
+5 -4
View File
@@ -26,20 +26,21 @@ import pooler
class stock_location_path(osv.osv):
_name = "stock.location.path"
_description = "Pushed Flows"
_columns = {
'name': fields.char('Operation', size=64),
'company_id': fields.many2one('res.company', 'Company'),
'product_id' : fields.many2one('product.product', 'Products', ondelete='cascade', select=1),
'journal_id': fields.many2one('stock.journal','Journal'),
'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1),
'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1),
'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1, required=True),
'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1, required=True),
'delay': fields.integer('Delay (days)', help="Number of days to do this transition"),
'invoice_state': fields.selection([
("invoiced", "Invoiced"),
("2binvoiced", "To Be Invoiced"),
("none", "Not from Picking")], "Invoice Status",
required=True,),
'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
'auto': fields.selection(
[('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
'Automatic Move',
@@ -71,7 +72,7 @@ class product_pulled_flow(osv.osv):
'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
'product_id':fields.many2one('product.product','Product'),
'invoice_state': fields.selection([
("invoiced", "Invoiced"),
addons/stock_location/stock_location_demo.xml → addons/stock_location/stock_location_demo_cpu1.xml
+41 -38
View File
@@ -4,86 +4,89 @@
<record id="product.product_product_cpu1" model="product.product">
<field name="description">This product is configured with example of push/pull flows</field>
</record>
<record id="stock_location_input0" model="stock.location">
<field name="location_id" ref="stock.stock_location_company"/>
<field eval="0" name="scrap_location"/>
<field name="company_id" ref="base.main_company"/>
<field name="usage">internal</field>
<field name="chained_location_type">none</field>
<field name="name">Input</field>
<field name="chained_auto_packing">manual</field>
<record id="stock_journal_quality" model="stock.journal">
<field name="name">Quality Control</field>
</record>
<record id="stock_location_qualitytest0" model="stock.location">
<field name="location_id" ref="stock.stock_location_company"/>
<field eval="0" name="scrap_location"/>
<field name="company_id" ref="base.main_company"/>
<field name="usage">internal</field>
<field name="chained_location_type">none</field>
<field name="name">Quality test</field>
<field name="name">Quality Control</field>
<field name="chained_auto_packing">manual</field>
</record>
<record id="stock.warehouse0" model="stock.warehouse">
<field name="lot_input_id" ref="stock_location_input0"/>
</record>
<record id="stock_location_path_3" model="stock.location.path">
<field name="location_from_id" ref="stock.stock_location_suppliers"/>
<field name="product_id" ref="product.product_product_cpu1"/>
<field name="auto">auto</field>
<field name="invoice_state">none</field>
<field eval="1" name="delay"/>
<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
<field name="picking_type">out</field>
</record>
<record id="stock_location_path_4" model="stock.location.path">
<field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
<field name="product_id" ref="product.product_product_cpu1"/>
<field name="auto">auto</field>
<field name="product_id" ref="product.product_product_cpu3"/>
<field name="auto">transparent</field>
<field name="invoice_state">none</field>
<field eval="1" name="delay"/>
<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
<field name="picking_type">out</field>
<field name="name">Receptions to Quality Control</field>
<field name="location_dest_id" ref="stock_location_qualitytest0"/>
<field name="location_from_id" ref="stock.stock_location_stock"/>
<field name="picking_type">in</field>
</record>
<record id="stock_location_path_5" model="stock.location.path">
<field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
<field name="product_id" ref="product.product_product_cpu1"/>
<field name="auto">auto</field>
<field name="location_from_id" ref="stock_location_qualitytest0"/>
<field name="product_id" ref="product.product_product_cpu3"/>
<field name="auto">manual</field>
<field name="invoice_state">none</field>
<field name="journal_id" ref="stock_journal_quality"/>
<field name="name">Store in Shelf</field>
<field eval="5" name="delay"/>
<field name="location_dest_id" ref="stock.stock_location_stock"/>
<field name="picking_type">out</field>
<field name="location_dest_id" ref="stock.stock_location_14"/>
<field name="picking_type">internal</field>
</record>
<record id="product_pulled_flow_l0" model="product.pulled.flow">
<field name="product_id" ref="product.product_product_cpu1"/>
<field name="location_src_id" ref="stock.stock_location_stock"/>
<field name="location_src_id" ref="stock.stock_location_intermediatelocation0"/>
<field name="location_id" ref="stock.stock_location_shop0"/>
<field name="partner_address_id" ref="base.main_address"/>
<field name="invoice_state">none</field>
<field name="company_id" ref="base.main_company"/>
<field name="company_id" ref="stock.res_company_shop0"/>
<field name="type_proc">move</field>
<field eval="0" name="cancel_cascade"/>
<field name="procure_method">make_to_stock</field>
<field name="picking_type">internal</field>
<field name="name">L001</field>
<field name="procure_method">make_to_order</field>
<field name="picking_type">in</field>
<field name="name">Receive from Warehouse</field>
</record>
<record id="product_pulled_flow_l1" model="product.pulled.flow">
<field name="product_id" ref="product.product_product_cpu1"/>
<field name="location_id" ref="stock.stock_location_suppliers"/>
<field name="location_id" ref="stock.stock_location_intermediatelocation0"/>
<field name="location_src_id" ref="stock.stock_location_stock"/>
<field name="partner_address_id" ref="stock.res_partner_address_fabien0"/>
<field name="type_proc">move</field>
<field name="invoice_state">none</field>
<field name="company_id" ref="base.main_company"/>
<field name="type_proc">buy</field>
<field eval="0" name="cancel_cascade"/>
<field name="procure_method">make_to_stock</field>
<field name="picking_type">out</field>
<field name="name">L002</field>
<field name="name">Deliver Shop</field>
</record>
<record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
<field name="product_max_qty">20.0</field>
<field name="product_min_qty">10.0</field>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="company_id" ref="stock.res_company_shop0"/>
<field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
<field name="location_id" ref="stock.stock_location_shop0"/>
<field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
</record>
<record id="sale_shop1" model="sale.shop">
<field name="name">Shop 1</field>
<field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
<field name="company_id" ref="stock.res_company_shop0"/>
<field model="account.payment.term" name="payment_default_id" search="[]"/>
</record>
<record id="sale_shop2" model="sale.shop">
<field name="name">Shop 2</field>
<field name="warehouse_id" ref="stock.stock_warehouse_shop1"/>
<field name="company_id" ref="stock.res_company_tinyshop0"/>
<field model="account.payment.term" name="payment_default_id" search="[]"/>
</record>
</data>
</openerp>
addons/stock_location/stock_location_demo_cpu3.yml
+55
View File
@@ -0,0 +1,55 @@
-
!record {model: stock.journal, id: journal_pick}:
name: Pick List
-
!record {model: stock.journal, id: journal_pack}:
name: Packing
-
!record {model: stock.journal, id: journal_gate_a}:
name: Delivery Gate A
-
!record {model: stock.journal, id: journal_gate_b}:
name: Delivery Gate B
-
!record {model: stock.location, id: location_order}:
name: Order Processing
usage: internal
location_id: stock.stock_location_company
-
!record {model: stock.location, id: location_dispatch_zone}:
name: Dispatch Zone
usage: internal
location_id: location_order
-
!record {model: stock.location, id: location_gate_a}:
name: Gate A
usage: internal
location_id: location_dispatch_zone
chained_journal_id: journal_gate_a
chained_location_type: customer
chained_auto_packing: manual
chained_picking_type: out
-
!record {model: stock.location, id: location_pack_zone}:
name: Pack Zone
usage: internal
location_id: location_order
chained_journal_id: journal_pack
chained_location_id: location_gate_a
chained_location_type: fixed
chained_auto_packing: manual
chained_picking_type: internal
-
!record {model: stock.location, id: location_gate_b}:
name: Gate B
usage: internal
location_id: location_dispatch_zone
-
!record {model: stock.location.path, id: push_pick}:
name: Pick List
product_id: product.product_product_cpu3
journal_id: journal_pick
location_from_id: stock.stock_location_output
location_dest_id: location_pack_zone
picking_type: internal
auto: transparent
addons/stock_location/stock_location_view.xml
+9 -6
View File
@@ -43,10 +43,11 @@
<page string="Logistic Flow">
<field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
<tree string="Pulled flows">
<field name="location_id"/>
<field name="type_proc"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="name"/>
<field name="location_id"/>
<field name="type_proc"/>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="journal_id" groups="base.group_extended"/>
</tree>
<form string="Pulled Paths">
<separator string="Conditions" colspan="4"/>
@@ -64,11 +65,12 @@
<field name="procure_method"/>
<field name="cancel_cascade"/>
<field name="invoice_state"/>
<field name="journal_id" groups="base.group_extended"/>
</group>
</form>
</field>
<field name="path_ids" editable="bottom" colspan="4" nolabel="1">
<field name="name"/>
<field name="name"/>
<tree string="Pushed flows" editable="bottom">
<field name="location_from_id"/>
<field name="location_dest_id"/>
@@ -86,13 +88,14 @@
<field name="name"/>
<field name="invoice_state"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="journal_id" groups="base.group_extended"/>
</form>
</field>
</page>
</notebook>
</field>
</record>
</data>
</data>
</openerp>
addons/stock_location/test/stock_location_push_flow.yml
+3 -3
View File
@@ -47,12 +47,12 @@
path_ids:
- auto: auto
invoice_state: none
location_dest_id: stock_location.stock_location_input0
location_dest_id: stock.stock_location_stock
location_from_id: stock.stock_location_suppliers
- auto: auto
invoice_state: none
location_dest_id: stock_location.stock_location_qualitytest0
location_from_id: stock_location.stock_location_input0
location_from_id: stock.stock_location_stock
- auto: auto
invoice_state: none
location_dest_id: stock.stock_location_stock
@@ -73,7 +73,7 @@
invoice_state: none
move_lines:
- date_expected: '2010-10-08 15:36:53'
location_dest_id: stock_location.stock_location_input0
location_dest_id: stock.stock_location_stock
location_id: stock.stock_location_suppliers
name: 'HP CD writers'
product_id: product_product_hpcdwriters0
addons/stock_no_autopicking/test/stock_no_autopicking.yml
+1 -1
View File
@@ -86,7 +86,7 @@
-
!record {model: mrp.routing, id: mrp_routing_productionrouting0}:
name: Production Routing
location_id: stock.stock_location_13
location_id: stock.stock_location_stock
workcenter_lines:
- cycle_nbr: 1.0
hour_nbr: 0.5
addons/wiki_faq/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 11:42+0000\n"
"PO-Revision-Date: 2010-10-10 10:53+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:19+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_faq
addons/wiki_quality_manual/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 11:48+0000\n"
"PO-Revision-Date: 2010-10-10 10:54+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:19+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_quality_manual
addons/wiki_sale_faq/i18n/de.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 11:54+0000\n"
"PO-Revision-Date: 2010-10-10 10:55+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"PO-Revision-Date: 2010-10-11 07:18+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_sale_faq