Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

forward port 7 to 8 #132

Merged
merged 18 commits into from
Aug 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
sudo: false
cache: pip

addons:
apt:
packages:
Expand Down
5 changes: 0 additions & 5 deletions __unported__/product_serial/stock_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
<record id="view_stock_picking_prodlot_selection" model="ir.ui.view">
<field name="name">stock.picking.prodlot.selection</field>
<field name="model">stock.picking.prodlot.selection</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Production Lots">
<field name="product_id" colspan="4"/>
Expand All @@ -117,7 +116,6 @@
<record id="view_picking_form" model="ir.ui.view">
<field name="name">stock.picking.form.prodlot.selection</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group/label[@colspan='6']" position="replace">
Expand All @@ -130,7 +128,6 @@
<record id="view_picking_in_form" model="ir.ui.view">
<field name="name">stock.picking.in.form.prodlot.selection</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group/label[@colspan='5']" position="replace">
Expand All @@ -143,7 +140,6 @@
<record id="view_picking_out_form" model="ir.ui.view">
<field name="name">stock.picking.out.form</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group/label[@colspan='6']" position="replace">
Expand All @@ -156,7 +152,6 @@
<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="inherit_id" ref="stock.view_picking_delivery_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/group/label[@colspan='6']" position="replace">
Expand Down
3 changes: 0 additions & 3 deletions __unported__/stock_obsolete/stock_obsolete_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<record model="ir.ui.view" id="product_product_obsolet_tree_view">
<field name="name">product.product.tree</field>
<field name="model">product.product</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Products obsolescence" editable="bottom" colors="red:outgoing_qty_till_12m==0.0;blue:depreciation in ['full']">
<field name="default_code"/>
Expand All @@ -24,7 +23,6 @@
<record model="ir.ui.view" id="product_product_obsolet_form_view">
<field name="name">product.normal.inherit.stock_obsolete.form</field>
<field name="model">product.product</field>
<field name="type">form</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<field name="uos_coeff" position="after">
Expand All @@ -38,7 +36,6 @@
<record id="wizard_product_obsolescence_form_view" model="ir.ui.view">
<field name="name">wizard.product.obsolescence.form</field>
<field name="model">wizard.product.obsolescence</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Product obsolescence computation">
<group colspan="4" col="2" string="Options">
Expand Down
11 changes: 7 additions & 4 deletions __unported__/stock_picking_mass_assign/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
##############################################################################

{'name': 'Delivery Orders Mass Assign',
'version': '0.1',
'author': "Camptocamp,Odoo Community Association (OCA)",
'version': '0.2',
'author': "Camptocamp,GRAP,Odoo Community Association (OCA)",
'license': 'AGPL-3',
'category': 'Warehouse Management',
'depends': ['stock',
Expand All @@ -32,8 +32,11 @@

Facilities to check the availability of delivery orders:

* A wizard which allows to check availability on multiple delivery
orders at a time.
* A wizard which allows on multiple delivery orders at a time to:
* check availability of Delivery Orders;
* force availability of Delivery Orders;
* process Pickings (deliver);

* A scheduled action to check availability of all the delivery orders.
It is not active by default.

Expand Down
89 changes: 74 additions & 15 deletions __unported__/stock_picking_mass_assign/i18n/de.po
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * stock_picking_mass_assign
# * stock_picking_mass_assign
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-17 09:00+0000\n"
"PO-Revision-Date: 2015-02-01 13:42+0100\n"
"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
"POT-Creation-Date: 2015-04-06 11:29+0000\n"
"PO-Revision-Date: 2015-04-06 11:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"X-Generator: Poedit 1.5.4\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: stock_picking_mass_assign
#: view:stock.picking.check.assign.all:0
msgid "Apply"
msgstr ""

#. module: stock_picking_mass_assign
#: view:stock.picking.check.assign.all:0
Expand All @@ -23,7 +27,7 @@ msgstr "Abbrechen"

#. module: stock_picking_mass_assign
#: model:ir.actions.act_window,name:stock_picking_mass_assign.action_check_assign_all
#: view:stock.picking.check.assign.all:0
#: field:stock.picking.check.assign.all,check_availability:0
msgid "Check Availability"
msgstr "Verfügbarkeit prüfen"

Expand All @@ -32,21 +36,76 @@ msgstr "Verfügbarkeit prüfen"
msgid "Check the availability of the selected delivery orders"
msgstr "Verfügbarkeit für ausgewählte Lieferaufträge prüfen"

#. module: stock_picking_mass_assign
#: field:stock.picking.check.assign.all,create_invoice:0
msgid "Create Invoices/Refunds"
msgstr "Erstelle Rechnung / Gutschrift"

#. module: stock_picking_mass_assign
#: field:stock.picking.check.assign.all,process_picking:0
msgid "Deliver"
msgstr "Ausliefern"

#. module: stock_picking_mass_assign
#: code:_description:0
#: model:ir.model,name:stock_picking_mass_assign.model_stock_picking_check_assign_all
#, python-format
msgid "Delivery Orders Check Availability"
msgstr "Verfügbarkeitsprüfung zur Lieferung"

#. module: stock_picking_mass_assign
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:62
#, python-format
msgid "Error"
msgstr ""

#. module: stock_picking_mass_assign
#: field:stock.picking.check.assign.all,force_availability:0
msgid "Force Availability"
msgstr "Erzwinge Verfügbarkeit"

#. module: stock_picking_mass_assign
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:63
#, python-format
msgid "No selected delivery orders"
msgstr ""

#. module: stock_picking_mass_assign
#: code:_description:0
#: model:ir.model,name:stock_picking_mass_assign.model_stock_picking
#, python-format
msgid "Picking List"
msgstr "Kommissionierschein"

#. module: stock_picking_mass_assign
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:115
#, python-format
msgid "Stock Invoice Onshipping"
msgstr ""

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,check_availability:0
msgid "check this box if you want to check the availability of the selected Delivery Orders."
msgstr ""

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,create_invoice:0
msgid "check this box if you want to create Invoices or Refunds for all the selected Delivery Orders."
msgstr ""

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,process_picking:0
msgid "check this box if you want to deliver all the selected Delivery Orders.\n"
" You'll not have the possibility to realize a partial delivery.\n"
" If you want to do that, please do it manually on the Delivery Order form."
msgstr ""

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,force_availability:0
msgid "check this box if you want to force the availability of the selected Delivery Orders."
msgstr ""

#. module: stock_picking_mass_assign
#: view:stock.picking.check.assign.all:0
msgid "or"
msgstr "oder"

#. module: stock_picking_mass_assign
#: code:_description:0
#: model:ir.model,name:stock_picking_mass_assign.model_stock_picking_check_assign_all
#, python-format
msgid "Delivery Orders Check Availability"
msgstr "Verfügbarkeitsprüfung zur Lieferung"
87 changes: 77 additions & 10 deletions __unported__/stock_picking_mass_assign/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,28 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-17 09:00+0000\n"
"PO-Revision-Date: 2014-07-17 09:00+0000\n"
"POT-Creation-Date: 2015-04-14 15:51+0000\n"
"PO-Revision-Date: 2015-04-14 15:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: stock_picking_mass_assign
#: view:stock.picking.check.assign.all:0
msgid "Apply"
msgstr "Appliquer"

#. module: stock_picking_mass_assign
#: view:stock.picking.check.assign.all:0
msgid "Cancel"
msgstr "Annuler"

#. module: stock_picking_mass_assign
#: model:ir.actions.act_window,name:stock_picking_mass_assign.action_check_assign_all
#: view:stock.picking.check.assign.all:0
#: field:stock.picking.check.assign.all,check_availability:0
msgid "Check Availability"
msgstr "Vérifier la disponibilité"

Expand All @@ -31,22 +36,84 @@ msgstr "Vérifier la disponibilité"
msgid "Check the availability of the selected delivery orders"
msgstr "Vérifier la disponibilité des bons de livraisons sélectionnés"

#. module: stock_picking_mass_assign
#: field:stock.picking.check.assign.all,create_invoice:0
msgid "Create Invoices/Refunds"
msgstr "Créer factures/avoirs"

#. module: stock_picking_mass_assign
#: model:ir.actions.act_window,name:stock_picking_mass_assign.action_deliver_all
#: field:stock.picking.check.assign.all,process_picking:0
msgid "Deliver"
msgstr "Livraison"

#. module: stock_picking_mass_assign
#: code:_description:0
#: model:ir.model,name:stock_picking_mass_assign.model_stock_picking_check_assign_all
#, python-format
msgid "Delivery Orders Check Availability"
msgstr "Vérification de la disponibilité des bons de livraisons"

#. module: stock_picking_mass_assign
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:62
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:75
#, python-format
msgid "Error"
msgstr "Erreur"

#. module: stock_picking_mass_assign
#: model:ir.actions.act_window,name:stock_picking_mass_assign.action_force_availability_all
#: field:stock.picking.check.assign.all,force_availability:0
msgid "Force Availability"
msgstr "Forcer la disponibilité"

#. module: stock_picking_mass_assign
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:63
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:76
#, python-format
msgid "No selected delivery orders"
msgstr "Aucun bon de livraison sélectionnés"

#. module: stock_picking_mass_assign
#: code:_description:0
#: model:ir.model,name:stock_picking_mass_assign.model_stock_picking
#, python-format
msgid "Picking List"
msgstr "Opération de manutention"

#. module: stock_picking_mass_assign
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:115
#: code:addons/stock_picking_mass_assign/wizard/check_assign_all.py:128
#, python-format
msgid "Stock Invoice Onshipping"
msgstr "Créer les factures brouillons"

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,check_availability:0
msgid "check this box if you want to check the availability of the selected Delivery Orders."
msgstr "cochez cette case si vous souhaitez vérifier la disponibilité des bons de livraisons sélectionnés."

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,create_invoice:0
msgid "check this box if you want to create Invoices or Refunds for all the selected Delivery Orders."
msgstr "cochez cette case si vous souhaitez créer des factures ou des avoirs pour les bons de livraisons sélectionnés."

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,process_picking:0
msgid "check this box if you want to deliver all the selected Delivery Orders.\n"
" You'll not have the possibility to realize a partial delivery.\n"
" If you want to do that, please do it manually on the Delivery Order form."
msgstr "cochez cette case si vous souhaitez réaliser la livraison pour tous les bons de livraisons sélectionnés.\n"
" Vous n'aurez pas la possibilité de réaliser une livraison partielle.\n"
" Si vous souhaitez le faire, veuillez le réaliser manuellement sur le formulaire du bon de livraison."

#. module: stock_picking_mass_assign
#: help:stock.picking.check.assign.all,force_availability:0
msgid "check this box if you want to force the availability of the selected Delivery Orders."
msgstr "cochez cette case si vous souhaitez forcer la disponibilité des bons de livraisons sélectionnés."

#. module: stock_picking_mass_assign
#: view:stock.picking.check.assign.all:0
msgid "or"
msgstr "ou"

#. module: stock_picking_mass_assign
#: code:_description:0
#: model:ir.model,name:stock_picking_mass_assign.model_stock_picking_check_assign_all
#, python-format
msgid "Delivery Orders Check Availability"
msgstr "Vérification de la disponibilité des bons de livraisons"

Loading