diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml
index 1f1a412c19e..5f06a20b1ab 100644
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@@ -7,7 +7,7 @@
currency_id: base.EUR
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 450.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml
index 6553635a781..7b995150af0 100644
--- a/addons/account/test/account_invoice_state.yml
+++ b/addons/account/test/account_invoice_state.yml
@@ -7,7 +7,7 @@
currency_id: base.EUR
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 450.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml
index 3bc4a778794..74dcbce56ba 100644
--- a/addons/account/test/account_sequence_test.yml
+++ b/addons/account/test/account_sequence_test.yml
@@ -20,7 +20,7 @@
currency_id: base.EUR
invoice_line:
- account_id: account.a_sale
- name: '[PC3] Medium PC'
+ name: '[PC-DEM] PC on Demand'
price_unit: 900.0
quantity: 10.0
product_id: product.product_product_5
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index ccebd2ea90c..9c5ce2dea3e 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -28,7 +28,7 @@
currency_id: base.EUR
invoice_line:
- account_id: account.a_expense
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 300.0
product_id: product.product_product_3
quantity: 10.0
diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml
index 516be311cf8..80dc098e770 100644
--- a/addons/account/test/test_edi_invoice.yml
+++ b/addons/account/test/test_edi_invoice.yml
@@ -24,7 +24,7 @@
uos_id: 1
quantity: 5.0
price_unit: 100.0
- name: 'Medium PC'
+ name: 'PC on Demand'
account_id: account.a_pay
tax_line:
- name: sale tax
@@ -104,9 +104,9 @@
"__model": "account.invoice.line",
"__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-1RP3so",
"uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
- "name": "Basic PC",
+ "name": "PC Assemble SC234",
"price_unit": 10.0,
- "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"],
+ "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
"quantity": 1.0
},
{
@@ -114,9 +114,9 @@
"__model": "account.invoice.line",
"__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-u2XV5",
"uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
- "name": "Medium PC",
+ "name": "PC on Demand",
"price_unit": 100.0,
- "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"],
+ "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
"quantity": 5.0
}]
}
@@ -137,12 +137,12 @@
assert invoice_new.type == 'in_invoice', "Invoice type was not set properly"
assert len(invoice_new.invoice_line) == 2, "invoice lines are not same"
for inv_line in invoice_new.invoice_line:
- if inv_line.name == 'Basic PC':
+ if inv_line.name == 'PC Assemble SC234':
assert inv_line.uos_id.name == "Unit" , "uom is not same"
assert inv_line.price_unit == 10 , "price unit is not same"
assert inv_line.quantity == 1 , "product qty is not same"
assert inv_line.price_subtotal == 10, "price sub total is not same"
- elif inv_line.name == 'Medium PC':
+ elif inv_line.name == 'PC on Demand':
assert inv_line.uos_id.name == "Unit" , "uom is not same"
assert inv_line.price_unit == 100 , "price unit is not same"
assert inv_line.quantity == 5 , "product qty is not same"
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 9cfb9d61229..2ea6c0b7890 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -54,7 +54,7 @@
currency_id: base.EUR
journal_id: account.bank_journal
name: Voucher Axelor
- narration: Basic PC
+ narration: PC Assemble SC234
line_dr_ids:
- account_id: account.cash
amount: 1000.0
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 85432f747aa..3996e0c27e4 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -6,7 +6,7 @@
company_id: base.main_company
journal_id: account.bank_journal
name: Voucher Axelor
- narration: Basic PC
+ narration: PC Assemble SC234
amount: 1000.0
line_ids:
- account_id: account.cash
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 45c352955f4..b706e6f0644 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -79,7 +79,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 200.0
quantity: 1.0
product_id: product.product_product_3
@@ -112,7 +112,7 @@
period_id: account.period_2
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 100.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index cc4c238aaaf..1a0c250395e 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -50,7 +50,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_expense
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 200.0
quantity: 1.0
product_id: product.product_product_3
@@ -85,7 +85,7 @@
type : in_invoice
invoice_line:
- account_id: account.a_expense
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 100.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index c37783247db..91f8a629cbb 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -85,7 +85,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 200.0
quantity: 1.0
product_id: product.product_product_3
@@ -118,7 +118,7 @@
period_id: account.period_2
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 100.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index 36593a2b9cd..cc5e819af30 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -85,7 +85,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 200.0
quantity: 1.0
product_id: product.product_product_3
@@ -118,7 +118,7 @@
period_id: account.period_2
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 100.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index d70bd41a2ff..37ea7ea981a 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -39,7 +39,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 150.0
quantity: 1.0
product_id: product.product_product_3
@@ -72,7 +72,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 80.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 5ca901cdbca..a78669c95ef 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -73,7 +73,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 200.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 2ca2ded1a72..125277191cb 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -52,7 +52,7 @@
period_id: account.period_1
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 1000.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index 585ce23aace..88f10e55918 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -7,7 +7,7 @@
currency_id: base.EUR
invoice_line:
- account_id: account.a_sale
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 450.0
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
index 44838514935..d1cffddc403 100644
--- a/addons/base_calendar/crm_meeting_data.xml
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -16,6 +16,14 @@
Off-site Meeting
+
+ Open Discussion
+
+
+
+ Feedback Meeting
+
+
Meeting
crm.meeting
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ed51c525335..a274dadfe01 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -49,7 +49,6 @@ Can you send details,
- Want to know features and benifits to use the new software.
@@ -550,53 +549,86 @@ Andrew
- Kitchen design
+ Plan to buy a Laptop
crm.lead
html
-
- email
- sent
-
-
-
- Reply
- crm.lead
-
- html
-
- comment
-
-
-
-
-
- Your inquiry
- crm.lead
-
- html
-
+ <![CDATA[Email0 inquiry]]><div><font size="2">Hello,</font></div><div><font size="2"><br></font></div><div><font size="2">I am interested in your company's product and I plan to buy a new laptop having latest technologies and affordable price.</font></div><div><font size="2">Can you please send me product catalogue?</font></div>
email
received
-
+
+
+
+ Re: Plan to buy a Laptop
+ crm.lead
+
+
+ plain
+ Dear Customer,
+Thanks for showing interest in our products.
+We have attached the catalogue,
+We would like to know your interests, Let us know if we can call you for more details.
+
+Thanks
+ email
+
+ sent
+
+
+
+
+ Re: Plan to buy a Laptop
+ crm.lead
+
+ plain
+ Yes, its open till 10:00 PM, you are welcome!
+ email
+ sent
+
+
+
+
+ Inquiry
+ crm.lead
+
+ plain
+ Hello,
+I am Jason from Le Club SARL,
+I am intertested to attend Training organized in your company,
+Can you send details,
+ email
+ received
+
+
+
+
+ Need Details
+ crm.lead
+
+ plain
+ Want to know features and benifits to use the new software.
+ comment
+
diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml
index 06c15d524b2..8867c46df75 100644
--- a/addons/l10n_ch/test/l10n_ch_dta.yml
+++ b/addons/l10n_ch/test/l10n_ch_dta.yml
@@ -25,7 +25,7 @@
-
!record {model: account.invoice.line, id: dta_invoice_line, view: False}:
account_id: account.a_expense
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 700.0
quantity: 10.0
product_id: product.product_product_3
diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml
index 4bacbf730f8..975e3569eb4 100644
--- a/addons/l10n_ch/test/l10n_ch_v11.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11.yml
@@ -26,7 +26,7 @@
-
!record {model: account.invoice.line, id: v11_test_invoice_line, view: False}:
account_id: account.a_expense
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 888.00
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml
index 811ee77bc4a..01e3a9624ea 100644
--- a/addons/l10n_ch/test/l10n_ch_v11_part.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml
@@ -27,7 +27,7 @@
-
!record {model: account.invoice.line, id: v11_part_test_invoice_line, view: False}:
account_id: account.a_expense
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
price_unit: 250.00
quantity: 1.0
product_id: product.product_product_3
diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml
index 5421b376348..1e296573876 100644
--- a/addons/mrp_repair/mrp_repair_demo.yml
+++ b/addons/mrp_repair/mrp_repair_demo.yml
@@ -5,7 +5,7 @@
date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
location_dest_id: stock.stock_location_14
location_id: stock.stock_location_stock
- name: '[PC1] Basic PC'
+ name: '[PCSC234] PC Assemble SC234'
product_id: product.product_product_3
product_qty: 1.0
product_uom: product.product_uom_unit
@@ -23,7 +23,7 @@
operations:
- location_dest_id: stock.location_production
location_id: stock.stock_location_stock
- name: '[HDD1] HDD Seagate 7200.8 80GB'
+ name: '[M-Las] Mouse, Laser'
price_unit: 50.0
product_id: product.product_product_11
product_uom: product.product_uom_unit
@@ -32,7 +32,7 @@
to_invoice: 1
type: add
fees_lines:
- - name: 'HDD1 Seagate repair fees'
+ - name: 'Mouse repair fees'
product_id: product.product_product_11
product_uom_qty: 1.0
product_uom: product.product_uom_unit
@@ -46,7 +46,7 @@
date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
location_dest_id: stock.stock_location_14
location_id: stock.stock_location_stock
- name: '[PC3] Medium PC'
+ name: '[PC-DEM] PC on Demand'
product_id: product.product_product_5
product_qty: 1.0
product_uom: product.product_uom_unit
@@ -64,7 +64,7 @@
operations:
- location_dest_id: stock.location_production
location_id: stock.stock_location_stock
- name: '[HDD2] HDD Seagate 7200.8 120GB'
+ name: '[M-Wir] Mouse, Wireless'
price_unit: 50.0
product_id: product.product_product_12
product_uom: product.product_uom_unit
@@ -73,7 +73,7 @@
to_invoice: 1
type: add
fees_lines:
- - name: 'HDD2 Seagate repair fees'
+ - name: 'Mouse Seagate repair fees'
product_id: product.product_product_12
product_uom_qty: 1.0
product_uom: product.product_uom_unit
@@ -87,7 +87,7 @@
date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
location_dest_id: stock.stock_location_14
location_id: stock.stock_location_stock
- name: '[PC4] Customizable PC'
+ name: '[LCD15] 15” LCD Monitor'
product_id: product.product_product_6
product_qty: 1.0
product_uom: product.product_uom_unit
@@ -105,7 +105,7 @@
operations:
- location_dest_id: stock.location_production
location_id: stock.stock_location_stock
- name: '[HDD3] HDD Seagate 7200.8 160GB'
+ name: '[RAM-SR5] RAM DDR SR5'
price_unit: 50.0
product_id: product.product_product_13
product_uom: product.product_uom_unit
@@ -114,7 +114,7 @@
to_invoice: 1
type: add
fees_lines:
- - name: 'HDD3 Seagate repair fees'
+ - name: 'RAM fees'
product_id: product.product_product_13
product_uom_qty: 1.0
product_uom: product.product_uom_unit
diff --git a/addons/mrp_repair/test/test_mrp_repair_cancel.yml b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
index 6a355f35b41..ee0e9c379e7 100644
--- a/addons/mrp_repair/test/test_mrp_repair_cancel.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
@@ -1,6 +1,6 @@
-
In order to test the cancel flow of mrp_repair module,
- I start by creating new copy Repair order for "Basic PC" product.
+ I start by creating new copy Repair order for "PC Assemble SC234" product.
-
!python {model: mrp.repair}: |
copy_id = self.copy(cr, uid, ref("mrp_repair_rmrp1"))
diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml
index 3265a4b133c..9534e79095f 100644
--- a/addons/point_of_sale/test/01_order_to_payment.yml
+++ b/addons/point_of_sale/test/01_order_to_payment.yml
@@ -12,7 +12,7 @@
account_collected_id: account.iva
price_include: 1
-
- I assign this 10 percent tax on the PC1 product as a sale tax
+ I assign this 10 percent tax on the [PCSC234] PC Assemble SC234 product as a sale tax
-
!record {model: product.product, id: product.product_product_3}:
taxes_id: [account_tax_10_incl]
@@ -27,7 +27,7 @@
account_collected_id: account.iva
price_include: 0
-
- I assign this 5 percent tax on the PC2 product as a sale tax
+ I assign this 5 percent tax on the PCSC349 product as a sale tax
-
!record {model: product.product, id: product.product_product_4}:
taxes_id: [account_tax_05_incl]
@@ -52,7 +52,7 @@
-
!workflow {model: pos.session, action: open, ref: pos_order_session0}
-
- I create a PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
+ I create a PoS order with 2 units of PCSC234 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl)
-
!record {model: pos.order, id: pos_order_pos0}:
company_id: base.main_company
diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
index 2280f15ca48..bd76eb08a9c 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -1,5 +1,5 @@
-
- I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
+ I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl)
-
!record {model: pos.order, id: pos_order_pos1}:
company_id: base.main_company
diff --git a/addons/product_margin/test/product_margin.yml b/addons/product_margin/test/product_margin.yml
index b1dee4a423d..9252fdd52b8 100644
--- a/addons/product_margin/test/product_margin.yml
+++ b/addons/product_margin/test/product_margin.yml
@@ -6,7 +6,7 @@
to_date: !eval "'%s-12-31' %(datetime.now().year)"
invoice_state: open_paid
-
- I open margin for PC3
+ I open margin for PC-DEM
-
!python {model: product.margin}: |
self.action_open_window(cr, uid, [ref("product_margin_wiz0")], {"lang": 'en_US',
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 0ead9f4443c..aaad6b167a0 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -438,5 +438,40 @@
+
+ project.task
+
+ plain
+ Hello Quentin,
+There is a change in customer requirement.
+Can you check the document from customer again.
+Thanks,
+ comment
+
+
+
+
+ project.task
+
+
+ plain
+ Ok, I have checked the mail,
+I will update the document and let you know.
+ comment
+
+
+
+
+
+ project.task
+
+
+ plain
+ Fine!
+Send it ASAP, its urgent.
+ comment
+
+
+
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index 02756959848..d0e90f3788d 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -86,13 +86,13 @@
"__model": "sale.order.line",
"__import_module": "purchase",
"__import_model": "purchase.order.line",
- "name": "Basic PC",
+ "name": "PC Assemble SC234",
"product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"],
"product_qty": 1.0,
"date_planned": "2011-09-30",
"sequence": 10,
"price_unit": 150.0,
- "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PC1] Basic PC"],
+ "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
},
{
"__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeadasdad",
@@ -100,13 +100,13 @@
"__model": "sale.order.line",
"__import_module": "purchase",
"__import_model": "purchase.order.line",
- "name": "Medium PC",
+ "name": "PC on Demand",
"product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"],
"product_qty": 10.0,
"sequence": 11,
"date_planned": "2011-09-15",
"price_unit": 20.0,
- "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC3] Medium PC"],
+ "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
}],
}
new_purchase_order_id = purchase_order_pool.edi_import(cr, uid, edi_document, context=context)
@@ -123,11 +123,11 @@
assert order_new.amount_untaxed == 350, "untaxed amount is not same"
assert len(order_new.order_line) == 2, "Purchase order lines number mismatch"
for purchase_line in order_new.order_line:
- if purchase_line.name == 'Basic PC':
+ if purchase_line.name == 'PC Assemble SC234':
assert purchase_line.product_uom.name == "Unit" , "uom is not same"
assert purchase_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
assert purchase_line.product_qty == 1 , "product qty is not same"
- elif purchase_line.name == 'Medium PC':
+ elif purchase_line.name == 'PC on Demand':
assert purchase_line.product_uom.name == "Unit" , "uom is not same"
assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
assert purchase_line.product_qty == 10 , "product qty is not same"
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 3d68a8b612f..21d348c2f0e 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -37,7 +37,7 @@
- [HDD3] HDD Seagate 7200.8 160GB
+ [RAM-SR5] RAM DDR SR5
@@ -54,7 +54,7 @@
- [HDD3] HDD Seagate 7200.8 160GB
+ [RAM-SR5] RAM DDR SR5
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 813c7e9af03..192d73472c4 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -301,6 +301,40 @@
+
+ sale.order
+
+ plain
+ Hi,
+I have a confusion for pricing of Services, I have heard there is a discount above 25 hours.
+Can you clarify please?
+ comment
+
+
+
+
+ sale.order
+
+
+ plain
+ Hello,
+Sorry but that scheme is not available for now,
+We would like to know if you confirm the quotation with pricing we sent to you.
+Thanks,
+Sales Department
+ comment
+
+
+
+
+ sale.order
+
+
+ plain
+ Ok, fine, we will intimate you after discussing with our team.
+ comment
+
+
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index e2a930146a7..18a59320d9c 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -13,7 +13,7 @@
- [PC1] Basic PC
+ [PCSC234] PC Assemble SC234
450
@@ -23,7 +23,7 @@
- [RAM512] DDR 512MB PC400
+ [HDD-SH2] HDD SH-2
90
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
index 148eed4f18f..a84c66c1468 100644
--- a/addons/sale/test/edi_sale_order.yml
+++ b/addons/sale/test/edi_sale_order.yml
@@ -11,13 +11,13 @@
product_uom_qty: 1.0
product_uom: 1
price_unit: 150.0
- name: 'Basic pc'
+ name: 'PC Assemble SC234'
order_line:
- product_id: product.product_product_5
product_uom_qty: 10.0
product_uom: 1
price_unit: 200.0
- name: 'Medium pc'
+ name: 'PC Assemble + Custom (PC on Demand)'
-
I confirm the sale order
-
@@ -72,10 +72,10 @@
"__model": "purchase.order.line",
"__import_module": "sale",
"__import_model": "sale.order.line",
- "name": "Basic PC",
+ "name": "PC Assemble SC234",
"date_planned": "2011-09-30",
"price_unit": 150.0,
- "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PC1] Basic PC"],
+ "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
"product_qty": 1.0,
"product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"],
},
@@ -85,10 +85,10 @@
"__model": "purchase.order.line",
"__import_module": "sale",
"__import_model": "sale.order.line",
- "name": "Medium PC",
+ "name": "PC on Demand",
"date_planned": "2011-09-15",
"price_unit": 100.0,
- "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC3] Medium PC"],
+ "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
"product_qty": 2.0,
"product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"],
}],
@@ -107,12 +107,12 @@
assert order_new.amount_untaxed == 350, "Untaxed amount is wrong"
assert len(order_new.order_line) == 2, "Sale order lines mismatch"
for sale_line in order_new.order_line:
- if sale_line.name == 'Basic PC':
+ if sale_line.name == 'PC Assemble SC234':
assert sale_line.delay == 18 , "incorrect delay: got %s, expected 18"%(sale_line.delay,)
assert sale_line.product_uom.name == "Unit" , "uom is not same"
assert sale_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 1 , "product qty is not same"
- elif sale_line.name == 'Medium PC':
+ elif sale_line.name == 'PC on Demand':
assert sale_line.delay == 3 , "incorrect delay: got %s, expected 3"%(sale_line.delay,)
assert sale_line.product_uom.name == "Unit" , "uom is not same"
assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 17f71807074..8038ea1aa5f 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -9,7 +9,7 @@
invoice_quantity: order
name: Test_SO011
order_line:
- - name: '[KEYA] Keyboard - AZERTY'
+ - name: '[CARD] Graphics Card'
price_unit: 7.0
product_uom: product.product_uom_unit
product_uom_qty: 100.0