Skip to content

Commit

Permalink
Merge pull request #20 from yvaucher/8.0-rename-to-logistics
Browse files Browse the repository at this point in the history
8.0 rename to logistics
  • Loading branch information
jgrandguillaume committed Nov 6, 2014
2 parents cb316c7 + 84ffb66 commit 65baeb2
Show file tree
Hide file tree
Showing 35 changed files with 204 additions and 204 deletions.
2 changes: 1 addition & 1 deletion framework_agreement_sourcing/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
In this case the tender flow is bypassed and confirmed PO will be generated
when the logistic requisition is confirmed.
When confirming Logistic request sourcing lines are generated.
When confirming Logistics request sourcing lines are generated.
Generation process will look up all agreements with remaining quantity
and use them one after the other.
Expand Down
8 changes: 4 additions & 4 deletions framework_agreement_sourcing/i18n/en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ msgstr "Which pricelist / currency you want ?"

#. module: framework_agreement_sourcing
#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_line
msgid "Logistic Requisition Line"
msgstr "Logistic Requisition Line"
msgid "Logistics Requisition Line"
msgstr "Logistics Requisition Line"

#. module: framework_agreement_sourcing
#: view:logistic.requisition.source:0
Expand Down Expand Up @@ -164,8 +164,8 @@ msgstr "You have ask for a quantity of %s \n"

#. module: framework_agreement_sourcing
#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_source
msgid "Logistic Requisition Source"
msgstr "Logistic Requisition Source"
msgid "Logistics Requisition Source"
msgstr "Logistics Requisition Source"

#. module: framework_agreement_sourcing
#: view:logistic.requisition.source.create.agr.po:0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ msgstr ""

#. module: framework_agreement_sourcing
#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_line
msgid "Logistic Requisition Line"
msgid "Logistics Requisition Line"
msgstr ""

#. module: framework_agreement_sourcing
Expand Down Expand Up @@ -154,7 +154,7 @@ msgstr ""

#. module: framework_agreement_sourcing
#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_source
msgid "Logistic Requisition Source"
msgid "Logistics Requisition Source"
msgstr ""

#. module: framework_agreement_sourcing
Expand Down
2 changes: 1 addition & 1 deletion logistic_budget/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
#
{"name": "Logistic Budget",
{"name": "Logistics Budget",
"version": "0.1",
"author": "Camptocamp",
"license": "AGPL-3",
Expand Down
16 changes: 8 additions & 8 deletions logistic_budget/i18n/en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ msgstr "General Remarks"

#. module: logistic_requisition_budget
#: report:addons/logistic_requisition_budget/report/logistic_requisition.mako:136
msgid "Logistic requisition"
msgstr "Logistic requisition"
msgid "Logistics requisition"
msgstr "Logistics requisition"

#. module: logistic_requisition_budget
#: report:addons/logistic_requisition_budget/report/logistic_requisition.mako:192
Expand All @@ -48,8 +48,8 @@ msgstr "Shipping address:"

#. module: logistic_requisition_budget
#: model:ir.model,name:logistic_requisition_budget.model_logistic_requisition_line
msgid "Logistic Requisition Line"
msgstr "Logistic Requisition Line"
msgid "Logistics Requisition Line"
msgstr "Logistics Requisition Line"

#. module: logistic_requisition_budget
#: report:addons/logistic_requisition_budget/report/logistic_requisition.mako:140
Expand Down Expand Up @@ -89,8 +89,8 @@ msgstr "Budget limit:"
#. module: logistic_requisition_budget
#: model:ir.actions.report.xml,name:logistic_requisition_budget.report_logistic_requisition
#: model:ir.model,name:logistic_requisition_budget.model_logistic_requisition
msgid "Logistic Requisition"
msgstr "Logistic Requisition"
msgid "Logistics Requisition"
msgstr "Logistics Requisition"

#. module: logistic_requisition_budget
#: code:addons/logistic_requisition_budget/wizard/cost_estimate.py:36
Expand Down Expand Up @@ -160,8 +160,8 @@ msgstr "Requesting entity"

#. module: logistic_requisition_budget
#: model:ir.model,name:logistic_requisition_budget.model_logistic_requisition_source
msgid "Logistic Requisition Source"
msgstr "Logistic Requisition Source"
msgid "Logistics Requisition Source"
msgstr "Logistics Requisition Source"

#. module: logistic_requisition_budget
#: view:logistic.requisition:0
Expand Down
8 changes: 4 additions & 4 deletions logistic_budget/i18n/logistic_requisition_budget.pot
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ msgstr ""

#. module: logistic_requisition_budget
#: report:addons/logistic_requisition_budget/report/logistic_requisition.mako:136
msgid "Logistic requisition"
msgid "Logistics requisition"
msgstr ""

#. module: logistic_requisition_budget
Expand All @@ -48,7 +48,7 @@ msgstr ""

#. module: logistic_requisition_budget
#: model:ir.model,name:logistic_requisition_budget.model_logistic_requisition_line
msgid "Logistic Requisition Line"
msgid "Logistics Requisition Line"
msgstr ""

#. module: logistic_requisition_budget
Expand Down Expand Up @@ -89,7 +89,7 @@ msgstr ""
#. module: logistic_requisition_budget
#: model:ir.actions.report.xml,name:logistic_requisition_budget.report_logistic_requisition
#: model:ir.model,name:logistic_requisition_budget.model_logistic_requisition
msgid "Logistic Requisition"
msgid "Logistics Requisition"
msgstr ""

#. module: logistic_requisition_budget
Expand Down Expand Up @@ -160,7 +160,7 @@ msgstr ""

#. module: logistic_requisition_budget
#: model:ir.model,name:logistic_requisition_budget.model_logistic_requisition_source
msgid "Logistic Requisition Source"
msgid "Logistics Requisition Source"
msgstr ""

#. module: logistic_requisition_budget
Expand Down
2 changes: 1 addition & 1 deletion logistic_budget/view/logistic_requisition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<field name="model">logistic.requisition.line</field>
<field name="inherit_id" ref="logistic_requisition.view_logistic_requisition_line_form"/>
<field name="arch" type="xml">
<xpath expr="//form[@string='Logistic Requisition Line']/sheet/group/group/field[@name='currency_id']" position="after">
<xpath expr="//form[@string='Logistics Requisition Line']/sheet/group/group/field[@name='currency_id']" position="after">
<field name="budget_unit_price" widget="monetary"
options="{'currency_field': 'currency_id'}"/>
<field name="budget_tot_price" widget="monetary"
Expand Down
4 changes: 2 additions & 2 deletions logistic_consignee/README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Logistic Consignee
==================
Logistics Consignee
===================

This module adds a consignee, the person to whom the shipment must
be delivered, on Sale Orders, Purchase Orders and Purchase Requisition.
Expand Down
2 changes: 1 addition & 1 deletion logistic_consignee/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#
#

{"name": "Logistic Consignee",
{"name": "Logistics Consignee",
"summary": "Consignee on Sales, Purchases, Purchase requisition for Pickings",
"version": "0.1",
"author": "Camptocamp",
Expand Down
14 changes: 7 additions & 7 deletions logistic_order/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#
##############################################################################

{"name": "Logistic Order",
"summary": "Sales Order as Logistic Order",
{"name": "Logistics Order",
"summary": "Sales Order as Logistics Order",
"version": "0.1",
"author": "Camptocamp",
"license": "AGPL-3",
Expand All @@ -28,15 +28,15 @@
"images": [],
"website": "http://www.camptocamp.com",
"description": """
Logistic Order
==============
Logistics Order
===============
This module customizes the Sales Orders to disguise them in Logistic Orders
This module customizes the Sales Orders to disguise them in Logistics Orders
A draft Sale order is now a Cost Estimate
An opened Sale order is now a Logistic Order
An opened Sale order is now a Logistics Order
* Adds Consignee, Incoterm Address and Delivery time on the Logistic Order
* Adds Consignee, Incoterm Address and Delivery time on the Logistics Order
* Adds a main menu entry `Order Management`
Expand Down
4 changes: 2 additions & 2 deletions logistic_order/data/logistic_order_sequence.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

<!-- Sequences for sale.order -->
<record id="sale.seq_type_sale_order" model="ir.sequence.type">
<field name="name">Logistic Order</field>
<field name="name">Logistics Order</field>
<field name="code">sale.order</field>
</record>

<record id="sale.seq_sale_order" model="ir.sequence">
<field name="name">Logistic Order</field>
<field name="name">Logistics Order</field>
<field name="code">sale.order</field>
<field name="prefix">LO</field>
<field name="padding">3</field>
Expand Down
12 changes: 6 additions & 6 deletions logistic_order/i18n/en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -108,24 +108,24 @@ msgstr ""

#. module: logistic_order
#: view:sale.order:logistic_order.view_order_form
msgid "Logistic Order"
msgid "Logistics Order"
msgstr ""

#. module: logistic_order
#: view:website:sale.report_saleorder_document
msgid "Logistic Order N°"
msgid "Logistics Order N°"
msgstr ""

#. module: logistic_order
#: model:ir.actions.act_window,name:logistic_order.action_orders
#: model:ir.ui.menu,name:logistic_order.menu_logistic_order
#: view:sale.order:logistic_order.view_sales_order_filter
msgid "Logistic Orders"
msgid "Logistics Orders"
msgstr ""

#. module: logistic_order
#: view:sale.order:logistic_order.view_sales_order_filter
msgid "My Logistic Orders"
msgid "My Logistics Orders"
msgstr ""

#. module: logistic_order
Expand Down Expand Up @@ -162,7 +162,7 @@ msgstr "Cost Estimate Sent"
#. module: sale
#: selection:sale.order,state:0
msgid "Sale to Invoice"
msgstr "Logistic Order to Invoice"
msgstr "Logistics Order to Invoice"

#. module: logistic_order
#: model:ir.model,name:logistic_order.model_sale_order
Expand All @@ -172,7 +172,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,state:0
msgid "Sales Order"
msgstr "Logistic Order"
msgstr "Logistics Order"

#. module: logistic_order
#: view:sale.order:logistic_order.view_sales_order_filter
Expand Down
10 changes: 5 additions & 5 deletions logistic_order/i18n/logistic_order.pot
Original file line number Diff line number Diff line change
Expand Up @@ -103,24 +103,24 @@ msgstr ""

#. module: logistic_order
#: view:sale.order:logistic_order.view_order_form
msgid "Logistic Order"
msgid "Logistics Order"
msgstr ""

#. module: logistic_order
#: view:website:sale.report_saleorder_document
msgid "Logistic Order N°"
msgid "Logistics Order N°"
msgstr ""

#. module: logistic_order
#: model:ir.actions.act_window,name:logistic_order.action_orders
#: model:ir.ui.menu,name:logistic_order.menu_logistic_order
#: view:sale.order:logistic_order.view_sales_order_filter
msgid "Logistic Orders"
msgid "Logistics Orders"
msgstr ""

#. module: logistic_order
#: view:sale.order:logistic_order.view_sales_order_filter
msgid "My Logistic Orders"
msgid "My Logistics Orders"
msgstr ""

#. module: logistic_order
Expand Down Expand Up @@ -157,7 +157,7 @@ msgstr ""
#. module: logistic_order
#: selection:sale.order,state:0
msgid "Sale to Invoice"
msgstr "Logistic Order to Invoice"
msgstr "Logistics Order to Invoice"

#. module: logistic_order
#: model:ir.model,name:logistic_order.model_sale_order
Expand Down
2 changes: 1 addition & 1 deletion logistic_order/view/report_logisticorder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<xpath expr="//h2" position="replace">
<h2>
<span t-if="o.state not in ['progress','manual','done']">Cost Estimate N° </span>
<span t-if="o.state in ['progress','manual','done']">Logistic Order N° </span>
<span t-if="o.state in ['progress','manual','done']">Logistics Order N° </span>
<span t-field="o.name"/>
</h2>
</xpath>
Expand Down
8 changes: 4 additions & 4 deletions logistic_order/view/sale_order_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<attribute name="string">Cost Estimates</attribute>
</filter>
<filter name="sales" position="attributes">
<attribute name="string">Logistic Orders</attribute>
<attribute name="string">Logistics Orders</attribute>
</filter>
<filter name="my_sale_orders_filter" position="attributes">
<attribute name="string">My Logistic Orders</attribute>
<attribute name="string">My Logistics Orders</attribute>
</filter>
</field>
</record>
Expand All @@ -49,7 +49,7 @@
sequence="4"/>

<record id="action_orders" model="ir.actions.act_window">
<field name="name">Logistic Orders</field>
<field name="name">Logistics Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
Expand All @@ -69,7 +69,7 @@
<attribute name="string">Cost Estimate </attribute>
</xpath>
<xpath expr="//label[@string='Sales Order ']" position="attributes">
<attribute name="string">Logistic Order </attribute>
<attribute name="string">Logistics Order </attribute>
</xpath>
<field name="incoterm" position="after">
<field name="incoterm_address"/>
Expand Down
6 changes: 3 additions & 3 deletions logistic_requisition/README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This module allows you to manage your Logistic Requisitions.
============================================================
This module allows you to manage your Logistics Requisitions.
=============================================================

A Logistic requisition express a need that is requested somewhere.
A Logistics requisition express a need that is requested somewhere.
It allows to manage the sourcing of the needs before making a cost estimate to
the requestor.

Expand Down
4 changes: 2 additions & 2 deletions logistic_requisition/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#
#

{"name": "Logistic Requisition",
"version": "1.0",
{"name": "Logistics Requisition",
"version": "1.0.1",
"author": "Camptocamp",
"license": "AGPL-3",
"category": "Purchase Management",
Expand Down
12 changes: 6 additions & 6 deletions logistic_requisition/data/logistic_requisition_sequence.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
<openerp>
<data noupdate="1">
<record id="seq_type_logistic_requisition" model="ir.sequence.type">
<field name="name">Logistic Requisition</field>
<field name="name">Logistics Requisition</field>
<field name="code">logistic.requisition</field>
</record>
<record id="seq_logistic_requisition" model="ir.sequence">
<field name="name">Logistic Requisition</field>
<field name="name">Logistics Requisition</field>
<field name="code">logistic.requisition</field>
<field name="prefix">LR</field>
<field name="padding">5</field>
</record>
<record id="seq_type_logistic_requisition_line" model="ir.sequence.type">
<field name="name">Logistic Requisition Line</field>
<field name="name">Logistics Requisition Line</field>
<field name="code">logistic.requisition.line</field>
</record>
<record id="seq_logistic_requisition_line" model="ir.sequence">
<field name="name">Logistic Requisition Line</field>
<field name="name">Logistics Requisition Line</field>
<field name="code">logistic.requisition.line</field>
<field name="prefix">LRL</field>
<field name="padding">5</field>
</record>
<record id="seq_type_logistic_requisition_source" model="ir.sequence.type">
<field name="name">Logistic Requisition Source</field>
<field name="name">Logistics Requisition Source</field>
<field name="code">logistic.requisition.source</field>
</record>
<record id="seq_logistic_requisition_source" model="ir.sequence">
<field name="name">Logistic Requisition Source</field>
<field name="name">Logistics Requisition Source</field>
<field name="code">logistic.requisition.source</field>
<field name="prefix">LRS</field>
<field name="padding">5</field>
Expand Down
Loading

0 comments on commit 65baeb2

Please sign in to comment.