Skip to content

Commit

Permalink
Merge PR #90 into 10.0
Browse files Browse the repository at this point in the history 
Signed-off-by rvalyi
  • Loading branch information
@OCA-git-bot
OCA-git-bot committed Aug 30, 2019
2 parents 880e5cc + aac814f commit 62c7d89
Show file tree
Hide file tree
Showing 24 changed files with 456 additions and 509 deletions.
8 changes: 1 addition & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,9 @@ addon | version | summary
[account_fiscal_position_rule](account_fiscal_position_rule/) | 10.0.1.0.0 | Account Fiscal Position Rule
[account_fiscal_position_rule_purchase](account_fiscal_position_rule_purchase/) | 10.0.1.0.0 | Account Fiscal Position Rule Purchase
[account_fiscal_position_rule_sale](account_fiscal_position_rule_sale/) | 10.0.1.0.0 | Account Fiscal Position Rule Sale
[account_fiscal_position_rule_stock](account_fiscal_position_rule_stock/) | 10.0.1.0.0 | Account Fiscal Position Rule Stock
[account_product_fiscal_classification](account_product_fiscal_classification/) | 10.0.1.0.0 | Simplify taxes management for products


Unported addons
---------------
addon | version | summary
--- | --- | ---
[account_fiscal_position_rule_stock](account_fiscal_position_rule_stock/) | 8.0.1.0.0 (unported) | Account Fiscal Position Rule Stock

[//]: # (end addons)

Translation Status
Expand Down
2 changes: 2 additions & 0 deletions account_fiscal_position_rule_stock/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
from . import models
from . import tests
from . import wizards
38 changes: 10 additions & 28 deletions account_fiscal_position_rule_stock/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,25 @@
# coding: utf-8
###############################################################################
#
# account_fiscal_position_rule_stock for OpenERP
# Copyright (C) 2009 Akretion <http://www.akretion.com>
# @author Renato Lima <renato.lima@akretion.com>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
###############################################################################
# -*- coding: utf-8 -*-
# @ 2009 Akretion - www.akretion.com.br -
# @author Renato Lima <renato.lima@akretion.com>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

{
'name': 'Account Fiscal Position Rule Stock',
'version': '8.0.1.0.0',
'version': '10.0.1.0.0',
'category': 'Generic Modules/Accounting',
'author': "Akretion,Odoo Community Association (OCA)",
'author': "Akretion, Odoo Community Association (OCA)",
'license': 'AGPL-3',
'website': 'http://www.akretion.com',
'depends': [
'account_fiscal_position_rule',
'stock_account',
'stock_picking_invoicing',
],
'data': [
'views/stock_picking.xml',
'security/ir.model.access.csv',
],
'test': [
'tests/account_fiscal_position_rule_stock_test.yml',
'tests/sale_order_test.yml',
'tests/invoice_from_picking_test.yml'
'demo': [
'demo/account_fiscal_position_rule_stock_demo.xml',
],
'installable': False,
'installable': True,
}
145 changes: 145 additions & 0 deletions account_fiscal_position_rule_stock/demo/account_fiscal_position_rule_stock_demo.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">

<!-- Tax used to test -->
<record id="demo_tax_out_position_rule_stock" model="account.tax">
<field name="description">Test Fiscal Position Rule Stock</field>
<field name="name">Test Fiscal Position Rule Stock</field>
<field name="type_tax_use">sale</field>
<field name="amount">0.0</field>
<field name="amount_type">percent</field>
<field name="tax_group_id" ref="account.tax_group_taxes"/>
</record>

<!-- Tax used to test -->
<record id="demo_tax_out_picking" model="account.tax">
<field name="description">Test Invoice From Picking 20%</field>
<field name="name">Test Invoice From Picking 20%</field>
<field name="type_tax_use">sale</field>
<field name="amount">20.00</field>
<field name="amount_type">percent</field>
<field name="tax_group_id" ref="account.tax_group_taxes"/>
</record>

<!-- Include Tax on Produtcs -->
<record id="product.product_product_5b_product_template" model="product.template">
<field name="taxes_id" eval="[(6,0,[ref('demo_tax_out_position_rule_stock')])]"/>
</record>

<record id="product.product_product_11b_product_template" model="product.template">
<field name="taxes_id" eval="[(6,0,[ref('demo_tax_out_position_rule_stock')])]"/>
</record>

<record model="product.template" id="product.product_product_10_product_template" >
<field name="taxes_id" eval="[(6,0,[ref('demo_tax_out_position_rule_stock')])]"/>
</record>

<record model="product.template" id="product.product_product_5_product_template" >
<field name="taxes_id" eval="[(6,0,[ref('demo_tax_out_position_rule_stock')])]"/>
</record>

<record model="product.template" id="product.product_product_9_product_template" >
<field name="taxes_id" eval="[(6,0,[ref('demo_tax_out_position_rule_stock')])]"/>
</record>

<!-- Fiscal Position -->
<record model="account.fiscal.position" id="test_fiscal_position_stock">
<field name="name">Test - Fiscal Position Stock</field>
<field name="active">True</field>
</record>

<!-- Fiscal Position Tax -->
<record model="account.fiscal.position.tax" id="test_fiscal_position_stock_tax">
<field name="position_id" ref="test_fiscal_position_stock"/>
<field name="tax_src_id" ref="demo_tax_out_position_rule_stock"/>
<field name="tax_dest_id" ref="demo_tax_out_picking"/>
</record>

<!-- Fiscal Rule -->
<record model="account.fiscal.position.rule" id="test_fiscal_position_rule">
<field name="name">Test - Fiscal Position Stock</field>
<field name="company_id" ref="base.main_company"/>
<field name="fiscal_position_id" ref="test_fiscal_position_stock"/>
<field name="use_picking">True</field>
</record>

<!-- Picking Test - 1 -->
<record model="stock.picking" id="test_fiscal_position_rule_stock_1">
<field name="partner_id" ref="base.res_partner_12"/>
<field name="picking_type_id" ref="stock.picking_type_out"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
<field name="origin">Test - account_fiscal_position_rule_stock - 1</field>
<field name="fiscal_position_id" ref="test_fiscal_position_stock"/>
</record>

<record model="stock.move" id="test_fiscal_position_rule_stock_move_1_1">
<field name="name">Test - account_fiscal_position_rule_stock - 1</field>
<field name="product_id" ref="product.product_product_7_product_template"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="picking_id" ref="test_fiscal_position_rule_stock_1"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
</record>

<record model="stock.move" id="test_fiscal_rule_stock_move_1_2">
<field name="name">Test - account_fiscal_position_rule_stock - 1</field>
<field name="product_id" ref="product.product_product_11"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="picking_id" ref="test_fiscal_position_rule_stock_1"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
</record>

<!-- Picking Test - 2 -->
<record model="stock.picking" id="test_fiscal_position_rule_stock_2">
<field name="partner_id" ref="base.res_partner_2"/>
<field name="picking_type_id" ref="stock.picking_type_out"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
<field name="origin">Test - account_fiscal_position_rule_stock - 2 </field>
<field name="fiscal_position_id" ref="test_fiscal_position_stock"/>
</record>

<record model="stock.move" id="test_fiscal_position_rule_stock_move_2_1">
<field name="name">Test - account_fiscal_position_rule_stock - 2</field>
<field name="product_id" ref="product.product_product_8_product_template"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="picking_id" ref="test_fiscal_position_rule_stock_2"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
</record>

<record model="stock.move" id="test_fiscal_position_rule_stock_move_2_2">
<field name="name">Test - account_fiscal_position_rule_stock - 2</field>
<field name="product_id" ref="product.product_product_9"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="picking_id" ref="test_fiscal_position_rule_stock_2"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
</record>

<record model="stock.move" id="test_fiscal_position_rule_stock_move_2_3">
<field name="name">Test - account_fiscal_position_rule_stock - 2</field>
<field name="product_id" ref="product.product_product_10"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="product.product_uom_unit"/>
<field name="picking_id" ref="test_fiscal_position_rule_stock_2"/>
<field name="location_id" ref="stock.stock_location_stock"/>
<field name="location_dest_id" ref="stock.stock_location_customers"/>
<field name="invoice_state">2binvoiced</field>
</record>

</data>
</odoo>
42 changes: 42 additions & 0 deletions account_fiscal_position_rule_stock/i18n/account_fiscal_position_rule_stock.pot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_fiscal_position_rule_stock
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \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: account_fiscal_position_rule_stock
#: model:ir.model.fields,field_description:account_fiscal_position_rule_stock.field_stock_picking_fiscal_position_id
msgid "Fiscal Position"
msgstr ""

#. module: account_fiscal_position_rule_stock
#: model:ir.model,name:account_fiscal_position_rule_stock.model_stock_invoice_onshipping
msgid "Stock Invoice Onshipping"
msgstr ""

#. module: account_fiscal_position_rule_stock
#: model:account.tax,description:account_fiscal_position_rule_stock.demo_tax_out_position_rule_stock
#: model:account.tax,name:account_fiscal_position_rule_stock.demo_tax_out_position_rule_stock
msgid "Test Fiscal Position Rule Stock"
msgstr ""

#. module: account_fiscal_position_rule_stock
#: model:account.tax,description:account_fiscal_position_rule_stock.demo_tax_out_picking
#: model:account.tax,name:account_fiscal_position_rule_stock.demo_tax_out_picking
msgid "Test Invoice From Picking 20%"
msgstr ""

#. module: account_fiscal_position_rule_stock
#: model:ir.model,name:account_fiscal_position_rule_stock.model_stock_picking
msgid "Transfer"
msgstr ""

0 comments on commit 62c7d89

Please sign in to comment.