Skip to content

Commit

Permalink
Merge pull request OCA#316 from LoicSenseFly/BSSFL-434_Payment_mode
Browse files Browse the repository at this point in the history
[BSSFL-434] Payment mode
  • Loading branch information
LoicSenseFly committed Dec 28, 2017
2 parents c91c5cb + ff52b68 commit d1aae04
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 70 deletions.
4 changes: 4 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ Release History
latest (unreleased)
+++++++++++++++++++

**Data**

* BSSFL-434: Payment mode

**Features and Improvements**

**Bugfixes**
Expand Down
2 changes: 1 addition & 1 deletion odoo/data/demo/invoice_supp_head.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"id","company_id/id","partner_id/id","number","currency_id/id","date_invoice","journal_id/id","account_id/id","type","state","origin","reference_type","reference","comment"
"__setup__.account_invoice_35392","base.main_company","__setup__.res_partner_68","EXJ/2017/22867","base.CHF","2017-12-01","__setup__.account_journal_8","l10n_ch.1_ch_coa_2000","in_invoice","draft","PO201710174171","none","","17/00887"
"__setup__.account_invoice_35929","base.main_company","__setup__.res_partner_185","ecnj/2017/0219","base.CHF","2017-10-30","__setup__.account_journal_10","l10n_ch.1_ch_coa_2000","in_refund","draft","","none","","37113346"
"__setup__.account_invoice_35929","base.main_company","__setup__.res_partner_185","ecnj/2017/0219","base.CHF","2017-10-30","__setup__.account_journal_8","l10n_ch.1_ch_coa_2000","in_refund","draft","","none","","37113346"
"__setup__.account_invoice_36425","base.main_company","__setup__.res_partner_65","EXJ/2017/22873","base.CHF","2017-12-01","__setup__.account_journal_8","l10n_ch.1_ch_coa_2000","in_invoice","draft","PO201711234317","none","","2060978"
"__setup__.account_invoice_36494","base.main_company","__setup__.res_partner_65","EXJ/2017/22774","base.CHF","2017-11-21","__setup__.account_journal_8","l10n_ch.1_ch_coa_2000","in_invoice","draft","","none","","2060729"
"__setup__.account_invoice_36538","base.main_company","__setup__.res_partner_68","EXJ/2017/23044","base.CHF","2017-12-01","__setup__.account_journal_8","l10n_ch.1_ch_coa_2000","in_invoice","draft","PO201710274211","none","","17//00937"
Expand Down
8 changes: 8 additions & 0 deletions odoo/data/install/account.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"__setup__.account_account_1677","base.main_company","10380","Compte courant Paypal AUD","true","base.AUD","account.data_account_type_liquidity","","",""
"__setup__.account_account_2313","base.main_company","10390","Compte courant Paypal CAD","true","base.CAD","account.data_account_type_liquidity","","",""
"__setup__.account_account_2328","base.main_company","10400","Compte de consignation CS (01-3)","true","","account.data_account_type_liquidity","","",""
"__setup__.account_account_2435","base.main_company","10420","Compte courant Paypal HKD","true","base.HKD","account.data_account_type_liquidity","","",""
"__setup__.account_account_30","base.main_company","10510","Placements","false","","account.data_account_type_liquidity","","",""
"__setup__.account_account_2307","base.main_company","10600","Compte courant senseFly Inc","false","base.USD","account.data_account_type_liquidity","1","A45100",""
"__setup__.account_account_2347","base.main_company","10610","Compte courant Parrot ","false","","account.data_account_type_liquidity","","",""
Expand Down Expand Up @@ -97,8 +98,10 @@
"__setup__.account_account_2342","base.main_company","31230","Ventes eBee SQ","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_2373","base.main_company","31240","Ventes eBee Plus","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_1636","base.main_company","31300","Ventes albris","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_2436","base.main_company","31400","Ventes Elios","false","","account.data_account_type_revenue","-1","R70100",""
"l10n_ch.1_ch_coa_3200","base.main_company","32000","Ventes spare parts ","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_2314","base.main_company","32100","Ventes d’optional payloads","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_2437","base.main_company","32400","Ventes spare parts Elios","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_1627","base.main_company","33100","Ventes SAV ","false","","account.data_account_type_revenue","-1","R70100",""
"__setup__.account_account_602","base.main_company","33200","Ventes de prestations diverses","false","","account.data_account_type_revenue","-1","R70600",""
"__setup__.account_account_2337","base.main_company","33210","Ventes de produits divers","false","","account.data_account_type_revenue","-1","R70100",""
Expand Down Expand Up @@ -194,6 +197,7 @@
"__setup__.account_account_1753","base.main_company","65200","Frais de transport sur vente","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_1754","base.main_company","65300","Autres frais de transport","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_1755","base.main_company","65400","Droits de douane","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_2442","base.main_company","65500","TVA Européenne","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_1479","base.main_company","66100","Frais comptable","false","","account.data_account_type_expenses","-1","R62800",""
"__setup__.account_account_1613","base.main_company","66200","Frais juridique","true","","account.data_account_type_expenses","-1","R62200",""
"__setup__.account_account_1756","base.main_company","66300","Documents officiels","false","","account.data_account_type_expenses","-1","R60600",""
Expand All @@ -208,6 +212,7 @@
"__setup__.account_account_1426","base.main_company","69100","Impôts cantonaux, communaux et fédéraux","false","","account.data_account_type_expenses","-1","R63700",""
"__setup__.account_account_1071","base.main_company","69200","Taxes véhicules","false","","account.data_account_type_expenses","-1","R63700",""
"__setup__.account_account_1561","base.main_company","69300","Taxes et émoluments","true","","account.data_account_type_expenses","-1","R63700",""
"__setup__.account_account_2439","base.main_company","73300","Reprise provisions courantes","false","","account.data_account_type_expenses","-1","R78150",""
"__setup__.account_account_2395","base.main_company","73310","Reprise provision perte sur clients","false","","account.data_account_type_expenses","-1","R78150",""
"__setup__.account_account_2408","base.main_company","73330","Reprise provision travaux de garantie","false","","account.data_account_type_expenses","","",""
"__setup__.account_account_2397","base.main_company","73350","Reprise provision stock","false","","account.data_account_type_expenses","-1","R78170",""
Expand Down Expand Up @@ -330,6 +335,7 @@
"__setup__.account_account_1963","__setup__.company_inc","53300","Recruitment fees","false","","account.data_account_type_expenses","-1","R61100",""
"__setup__.account_account_2188","__setup__.company_inc","53400","Temporaries","false","","account.data_account_type_expenses","-1","R64100",""
"__setup__.account_account_2411","__setup__.company_inc","53500","Team Building","false","","account.data_account_type_expenses","-1","R62800",""
"__setup__.account_account_2438","__setup__.company_inc","53600","Employee Relocation Expense","false","","account.data_account_type_expenses","","",""
"__setup__.account_account_2215","__setup__.company_inc","61110","Rent - Buildings","false","","account.data_account_type_expenses","-1","R61300",""
"__setup__.account_account_2361","__setup__.company_inc","61120","Utilities Expense","false","","account.data_account_type_expenses","-1","R61500",""
"__setup__.account_account_2375","__setup__.company_inc","61210","Vehicle leasing","false","","account.data_account_type_expenses","-1","R61220",""
Expand All @@ -353,6 +359,8 @@
"__setup__.account_account_1910","__setup__.company_inc","65110","Shipping costs","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_2152","__setup__.company_inc","65120","COGS shipping","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_2153","__setup__.company_inc","65200","Shipping costs for sales ","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_2440","__setup__.company_inc","65300","Shipping CSS Warranty","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_2441","__setup__.company_inc","65301","Shipping CSS NON-Warranty","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_2097","__setup__.company_inc","65400","Customs duties","false","","account.data_account_type_expenses","-1","R62400",""
"__setup__.account_account_1874","__setup__.company_inc","66100","Accounting fees","false","","account.data_account_type_expenses","-1","R62800",""
"__setup__.account_account_2297","__setup__.company_inc","66110","Audit fees","false","","account.data_account_type_expenses","","",""
Expand Down
Loading

0 comments on commit d1aae04

Please sign in to comment.