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

[MERGE] forward port branch 10.0 up to 49ca43d75c

Browse Source
This commit is contained in:
Christophe Simonis
2019-03-13 13:23:43 +01:00
parent b47749effd 49ca43d75c
commit d5a8b238fa
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_jp/__manifest__.py
+1 -1
View File
@@ -5,7 +5,7 @@
{
'name': 'Japan - Accounting',
'version': '2.0',
'version': '2.1',
'category': 'Localization',
'description': """
addons/l10n_jp/data/account.account.template.csv
+20 -17
View File
@@ -19,22 +19,24 @@ A11802,A11802,前渡金,account.data_account_type_current_assets,,FALSE,,l10n_jp
A11804,A11804,前払費用,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A11805,A11805,立替金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A11806,A11806,仮払金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A11807,A11807,仮払消費税,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A11807,A11807,敷金・保証金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A11809,A11809,仮払消費税,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A11901,A11901,貸倒引当金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12111,A12111,建物及び構築物,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12112,A12112,建物及び構築物減償累計額,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12121,A12121,機械及び装置,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12122,A12122,機械及び装置物減償累計額,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12131,A12131,工具、機器及び備品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12132,A12132,工具、機器及び備品減償累計額,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12141,A12141,土地,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A1221,A1221,ソフトウェア,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A1222,A1222,ソフトウェア仮勘定,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A1223,A1223,その他無形固定資産,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12301,A12301,投資有価証券,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12302,A12302,関係会社株式,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12303,A12303,長期貸付金,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A13001,A13001,創立費,account.data_account_type_current_assets,,FALSE,,l10n_jp1
A12111,A12111,建物及び構築物,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A12112,A12112,建物及び構築物減償累計額,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A12121,A12121,機械及び装置,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A12122,A12122,機械及び装置物減償累計額,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A12131,A12131,工具、機器及び備品,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A12132,A12132,工具、機器及び備品減償累計額,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A12141,A12141,土地,account.data_account_type_fixed_assets,,FALSE,,l10n_jp1
A1221,A1221,ソフトウェア,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A1222,A1222,ソフトウェア仮勘定,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A1223,A1223,その他無形固定資産,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A12301,A12301,投資有価証券,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A12302,A12302,関係会社株式,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A12303,A12303,長期貸付金,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A12304,A12304,長期前払費用,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A13001,A13001,創立費,account.data_account_type_non_current_assets,,FALSE,,l10n_jp1
A21211,A21211,買掛金,account.data_account_type_payable,,TRUE,,l10n_jp1
A21212,A21212,買掛金(USD),account.data_account_type_payable,,TRUE,base.USD,l10n_jp1
A21215,A21215,支払手形,account.data_account_type_payable,,TRUE,,l10n_jp1
@@ -51,7 +53,7 @@ A21802,A21802,前受金,account.data_account_type_current_liabilities,,FALSE,,l1
A21803,A21803,預り金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A21804,A21804,仮受金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A21806,A21806,賞与引当金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A21807,A21807,仮受消費税,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A21809,A21809,仮受消費税,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A22001,A22001,社債,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A22002,A22002,長期借入金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
A22005,A22005,退職給付引当金,account.data_account_type_current_liabilities,,FALSE,,l10n_jp1
@@ -103,8 +105,9 @@ B61602,B61602,投資有価証券評価益(外益),account.data_account_type_othe
B61801,B61801,雑収入,account.data_account_type_other_income,,FALSE,,l10n_jp1
B62101,B62101,支払利息,account.data_account_type_expenses,,FALSE,,l10n_jp1
B62201,B62201,創立費償却,account.data_account_type_expenses,,FALSE,,l10n_jp1
B62202,B62202,減価償却費,account.data_account_type_expenses,,FALSE,,l10n_jp1
B62401,B62401,未実現為替差損,account.data_account_type_expenses,,FALSE,,l10n_jp1
B62402,B62402,実現為替差損,account.data_account_type_expenses,,FALSE,,l10n_jp1
B62501,B62501,実現為替差損,account.data_account_type_expenses,,FALSE,,l10n_jp1
B62601,B62601,投資有価証券売却損(外損),account.data_account_type_expenses,,FALSE,,l10n_jp1
B62602,B62602,投資有価証券評価損(外損),account.data_account_type_expenses,,FALSE,,l10n_jp1
B62801,B62801,雑費用,account.data_account_type_expenses,,FALSE,,l10n_jp1
1 id code name user_type_id/id tax_ids/id reconcile currency_id/id chart_template_id/id
19 A11804 A11804 前払費用 account.data_account_type_current_assets FALSE l10n_jp1
20 A11805 A11805 立替金 account.data_account_type_current_assets FALSE l10n_jp1
21 A11806 A11806 仮払金 account.data_account_type_current_assets FALSE l10n_jp1
22 A11807 A11807 仮払消費税 敷金・保証金 account.data_account_type_current_assets FALSE l10n_jp1
23 A11809 A11809 仮払消費税 account.data_account_type_current_assets FALSE l10n_jp1
24 A11901 A11901 貸倒引当金 account.data_account_type_current_assets FALSE l10n_jp1
25 A12111 A12111 建物及び構築物 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
26 A12112 A12112 建物及び構築物減償累計額 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
27 A12121 A12121 機械及び装置 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
28 A12122 A12122 機械及び装置物減償累計額 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
29 A12131 A12131 工具、機器及び備品 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
30 A12132 A12132 工具、機器及び備品減償累計額 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
31 A12141 A12141 土地 account.data_account_type_current_assets account.data_account_type_fixed_assets FALSE l10n_jp1
32 A1221 A1221 ソフトウェア account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
33 A1222 A1222 ソフトウェア仮勘定 account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
34 A1223 A1223 その他無形固定資産 account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
35 A12301 A12301 投資有価証券 account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
36 A12302 A12302 関係会社株式 account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
37 A12303 A12303 長期貸付金 account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
38 A13001 A12304 A13001 A12304 創立費 長期前払費用 account.data_account_type_current_assets account.data_account_type_non_current_assets FALSE l10n_jp1
39 A13001 A13001 創立費 account.data_account_type_non_current_assets FALSE l10n_jp1
40 A21211 A21211 買掛金 account.data_account_type_payable TRUE l10n_jp1
41 A21212 A21212 買掛金(USD) account.data_account_type_payable TRUE base.USD l10n_jp1
42 A21215 A21215 支払手形 account.data_account_type_payable TRUE l10n_jp1
53 A21803 A21803 預り金 account.data_account_type_current_liabilities FALSE l10n_jp1
54 A21804 A21804 仮受金 account.data_account_type_current_liabilities FALSE l10n_jp1
55 A21806 A21806 賞与引当金 account.data_account_type_current_liabilities FALSE l10n_jp1
56 A21807 A21809 A21807 A21809 仮受消費税 account.data_account_type_current_liabilities FALSE l10n_jp1
57 A22001 A22001 社債 account.data_account_type_current_liabilities FALSE l10n_jp1
58 A22002 A22002 長期借入金 account.data_account_type_current_liabilities FALSE l10n_jp1
59 A22005 A22005 退職給付引当金 account.data_account_type_current_liabilities FALSE l10n_jp1
105 B61801 B61801 雑収入 account.data_account_type_other_income FALSE l10n_jp1
106 B62101 B62101 支払利息 account.data_account_type_expenses FALSE l10n_jp1
107 B62201 B62201 創立費償却 account.data_account_type_expenses FALSE l10n_jp1
108 B62202 B62202 減価償却費 account.data_account_type_expenses FALSE l10n_jp1
109 B62401 B62401 未実現為替差損 account.data_account_type_expenses FALSE l10n_jp1
110 B62402 B62501 B62402 B62501 実現為替差損 account.data_account_type_expenses FALSE l10n_jp1
111 B62601 B62601 投資有価証券売却損(外損) account.data_account_type_expenses FALSE l10n_jp1
112 B62602 B62602 投資有価証券評価損(外損) account.data_account_type_expenses FALSE l10n_jp1
113 B62801 B62801 雑費用 account.data_account_type_expenses FALSE l10n_jp1
addons/l10n_jp/data/account.tax.template.csv
+6 -6
View File
@@ -1,9 +1,9 @@
id,name,description,chart_template_id/id,type_tax_use,amount_type,amount,price_include,sequence,include_base_amount,account_id/id,refund_account_id/id,tag_ids/id
tax_in_e,仮受消費税(外),仮受消費税(外),l10n_jp1,sale,percent,8,FALSE,1,FALSE,A21219,A21219,"tag_jp_03,tag_jp_12"
tax_in_i,仮受消費税(内),仮受消費税(内),l10n_jp1,sale,percent,8,TRUE,1,FALSE,A21219,A21219,"tag_jp_03,tag_jp_12"
tax_in_x,輸出免税,輸出免税,l10n_jp1,sale,percent,,FALSE,1,FALSE,A21219,A21219,"tag_jp_04,tag_jp_13"
tax_in_o,非課税販売,非課税販売,l10n_jp1,sale,percent,,FALSE,1,FALSE,A21219,A21219,"tag_jp_09,tag_jp_14"
tax_out_e,仮払消費税(外),仮払消費税(外),l10n_jp1,purchase,percent,8,FALSE,1,FALSE,A21807,A21807,"tag_jp_07,tag_jp_16"
tax_out_i,仮払消費税(内),仮払消費税(内),l10n_jp1,purchase,percent,8,TRUE,1,FALSE,A21807,A21807,"tag_jp_07,tag_jp_16"
tax_in_e,仮受消費税(外),消費税(外),l10n_jp1,sale,percent,8,FALSE,1,FALSE,A21809,A21809,"tag_jp_03,tag_jp_12"
tax_in_i,仮受消費税(内),消費税(内),l10n_jp1,sale,percent,8,TRUE,1,FALSE,A21809,A21809,"tag_jp_03,tag_jp_12"
tax_in_x,輸出免税,輸出免税,l10n_jp1,sale,percent,,FALSE,1,FALSE,,,"tag_jp_04,tag_jp_13"
tax_in_o,非課税販売,非課税販売,l10n_jp1,sale,percent,,FALSE,1,FALSE,,,"tag_jp_09,tag_jp_14"
tax_out_e,仮払消費税(外),消費税(外),l10n_jp1,purchase,percent,8,FALSE,1,FALSE,A11809,A11809,"tag_jp_07,tag_jp_16"
tax_out_i,仮払消費税(内),消費税(内),l10n_jp1,purchase,percent,8,TRUE,1,FALSE,A11809,A11809,"tag_jp_07,tag_jp_16"
tax_out_im,海外仕入,海外仕入,l10n_jp1,purchase,percent,,FALSE,1,FALSE,,,"tag_jp_08,tag_jp_17"
tax_out_o,非課税購買,非課税購買,l10n_jp1,purchase,percent,,FALSE,1,FALSE,,,"tag_jp_18"
1 id name description chart_template_id/id type_tax_use amount_type amount price_include sequence include_base_amount account_id/id refund_account_id/id tag_ids/id
2 tax_in_e 仮受消費税(外) 仮受消費税(外) 消費税(外) l10n_jp1 sale percent 8 FALSE 1 FALSE A21219 A21809 A21219 A21809 tag_jp_03,tag_jp_12
3 tax_in_i 仮受消費税(内) 仮受消費税(内) 消費税(内) l10n_jp1 sale percent 8 TRUE 1 FALSE A21219 A21809 A21219 A21809 tag_jp_03,tag_jp_12
4 tax_in_x 輸出免税 輸出免税 l10n_jp1 sale percent FALSE 1 FALSE A21219 A21219 tag_jp_04,tag_jp_13
5 tax_in_o 非課税販売 非課税販売 l10n_jp1 sale percent FALSE 1 FALSE A21219 A21219 tag_jp_09,tag_jp_14
6 tax_out_e 仮払消費税(外) 仮払消費税(外) 消費税(外) l10n_jp1 purchase percent 8 FALSE 1 FALSE A21807 A11809 A21807 A11809 tag_jp_07,tag_jp_16
7 tax_out_i 仮払消費税(内) 仮払消費税(内) 消費税(内) l10n_jp1 purchase percent 8 TRUE 1 FALSE A21807 A11809 A21807 A11809 tag_jp_07,tag_jp_16
8 tax_out_im 海外仕入 海外仕入 l10n_jp1 purchase percent FALSE 1 FALSE tag_jp_08,tag_jp_17
9 tax_out_o 非課税購買 非課税購買 l10n_jp1 purchase percent FALSE 1 FALSE tag_jp_18
addons/l10n_jp/data/account_chart_template_data.xml
+1 -1
View File
@@ -9,6 +9,6 @@
<field name="property_account_expense_categ_id" ref="A21219"/>
<field name="property_account_income_categ_id" ref="B41001"/>
<field name="income_currency_exchange_account_id" ref="B61501"/>
<field name="expense_currency_exchange_account_id" ref="B62601"/>
<field name="expense_currency_exchange_account_id" ref="B62501"/>
</record>
</odoo>
addons/website_sale/models/sale_order.py
+1 -1
View File
@@ -395,7 +395,7 @@ class Website(models.Model):
# TODO cache partner_id session
pricelist = self.env['product.pricelist'].browse(pricelist_id).sudo()
so_data = self._prepare_sale_order_values(partner, pricelist)
sale_order = self.env['sale.order'].sudo().create(so_data)
sale_order = self.env['sale.order'].with_context(force_company=request.website.company_id.id).sudo().create(so_data)
# set fiscal position
if request.website.partner_id.id != partner.id: