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

[MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka

Browse Source 
bzr revid: amb@tinyerp.com-20131028094412-512svv3vbqpl55g9
This commit is contained in:
Amit Bhavsar (Open ERP)
2013-10-28 15:14:12 +05:30
parent 14a48f5d98 02dec945de
commit e80dd25141
12 changed files with 280 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/test/01_order_to_payment.yml
+7 -7
View File
@@ -81,12 +81,12 @@
discount: 0.0
qty: 3.0
-
I check that the total of the order is equal to 450*2 + 300*3*1.05 and the tax of the order is equal to 900 -(450 * 2 / 1.1) + 300*0.05*3
I check that the total of the order is equal to 450*2 + 300*3*1.10 and the tax of the order is equal to 900 -(450 * 2) + 300*1.10*3
-
!python {model: pos.order}: |
order = self.browse(cr, uid, ref('pos_order_pos0'))
assert(abs(order.amount_total - (450*2 + 300*3*1.05)) < 0.01), "The order has a wrong amount, tax included"
assert(abs(order.amount_tax - (900-(450*2/1.1) + 300*0.05*3)) < 0.01), "The order has a wrong tax amount"
assert(abs(order.amount_total - (450*2 + 300*3*1.10)) < 0.01), "The order has a wrong amount, tax included"
assert(abs(order.amount_tax - (900-(450*2) + 300*0.10*3)) < 0.01), "The order has a wrong tax amount"
-
I want to add a global discount of 5 percent using the wizard
-
@@ -99,11 +99,11 @@
self.apply_discount(cr, uid, [ref("pos_discount_0")], {"active_model": "pos.order",
"active_ids": [ref("pos_order_pos0")], "active_id": ref("pos_order_pos0"), })
-
I check that the total of the order is now equal to (450*2 + 300*3*1.05)*0.95
I check that the total of the order is now equal to (450*2 + 300*3*1.10)*0.95
-
!python {model: pos.order}: |
order = self.browse(cr, uid, ref('pos_order_pos0'))
assert(abs(order.amount_total - (450*2 + 300*3*1.05)*0.95) < 0.01), "The order has a wrong total including tax and discounts"
assert(abs(order.amount_total - (450*2 + 300*3*1.10)*0.95) < 0.01), "The order has a wrong total including tax and discounts"
-
I click on the "Make Payment" wizard to pay the PoS order with a partial amount of 100.0 EUR
-
@@ -124,13 +124,13 @@
-
!python {model: pos.make.payment}: |
defs = self.default_get(cr, uid, ['amount'], {'active_id': ref('pos_order_pos0')})
assert abs(defs['amount'] - ((450*2 + 300*3*1.05)*0.95-100.0)) < 0.01, "The remaining balance is incorrect"
assert abs(defs['amount'] - ((450*2 + 300*3*1.10)*0.95-100.0)) < 0.01, "The remaining balance is incorrect"
-
I pay the remaining balance.
-
!record {model: pos.make.payment, id: pos_make_payment_1, context: '{"active_id": ref("pos_order_pos0"), "active_ids": [ref("pos_order_pos0")]}' }:
amount: !eval >
(450*2 + 300*3*1.05)*0.95-100.0
(450*2 + 300*3*1.10)*0.95-100.0
-
I click on the validate button to register the payment.
-
addons/point_of_sale/test/02_order_to_invoice.yml
+2 -2
View File
@@ -20,7 +20,7 @@
-
!record {model: pos.make.payment, id: pos_make_payment_2, context: '{"active_id": ref("pos_order_pos1"), "active_ids": [ref("pos_order_pos1")]}' }:
amount: !eval >
(450*2 + 300*3*1.05)*0.95
(450*2 + 300*3*1.10)*0.95
-
I click on the validate button to register the payment.
-
@@ -43,4 +43,4 @@
I test that the total of the attached invoice is correct
-
!assert {model: pos.order, id: pos_order_pos1, string: Invoice not correct}:
- amount_total == (450*2 + 300*3*1.05)*0.95
- amount_total == (450*2 + 300*3*1.10)*0.95
addons/product/__openerp__.py
+1
View File
@@ -62,6 +62,7 @@ Print product labels with barcode.
'product_pricelist_demo.yml',
'test/product_uom.yml',
'test/product_pricelist.yml',
'test/compute_price_margin.yml',
],
'installable': True,
'auto_install': False,
addons/product/product.py
+1 -1
View File
@@ -319,7 +319,7 @@ class product_template(osv.osv):
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price to compute the customer price. Sometimes called the catalog price."),
'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Cost price of the product used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user"),
'standard_price': fields.float('Cost Price', digits_compute=dp.get_precision('Product Price'), help="Cost price of the product template used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user"),
'volume': fields.float('Volume', help="The volume in m3."),
'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
addons/product/product_data.xml
+4 -1
View File
@@ -189,7 +189,7 @@ parameter) will see those record just disappear.
<!--
Product
-->
<record id="product_product_consultant" model="product.product">
<record id="product_template_consultant" model="product.template">
<field name="list_price">75.0</field>
<field name="standard_price">30.0</field>
<field name="uom_id" ref="product.product_uom_hour"/>
@@ -198,5 +198,8 @@ parameter) will see those record just disappear.
<field name="categ_id" ref="product.product_category_all"/>
<field name="type">service</field>
</record>
<record id="product_product_consultant" model="product.product">
<field name="product_tmpl_id" ref="product_template_consultant"/>
</record>
</data>
</openerp>
addons/product/product_demo.xml
+98 -276
View File
@@ -96,62 +96,47 @@
<record id="product_template_3" model="product.template">
<field name="name">PC Assemble SC234</field>
<field name="name">PC Assemble</field>
<field name="categ_id" ref="product_category_4"/>
<field name="list_price">450.0</field>
<field name="standard_price">300.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description_sale">17" LCD Monitor
Processor AMD 8-Core
512MB RAM
HDD SH-1</field>
</record>
<record id="product_product_3" model="product.product">
<field name="product_tmpl_id" ref="product_template_3"/>
<field name="default_code">PCSC234</field>
<field name="variants">SC234</field>
<field name="price_extra">0.0</field>
<field name="description">17" LCD Monitor
Processor AMD 8-Core
512MB RAM
HDD SH-1</field>
</record>
<record id="product_template_4" model="product.template">
<field name="name">PC Assemble SC349</field>
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">500.0</field>
<field name="list_price">750.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description_sale">19" LCD Monitor
<record id="product_product_4" model="product.product">
<field name="product_tmpl_id" ref="product_template_3"/>
<field name="default_code">PCSC349</field>
<field name="variants">SC349</field>
<field name="price_extra">300.0</field>
<field name="description">19" LCD Monitor
Processor Core i5 2.70 Ghz
2GB RAM
HDD SH-1</field>
</record>
<record id="product_product_4" model="product.product">
<field name="product_tmpl_id" ref="product_template_4"/>
<field name="default_code">PCSC349</field>
</record>
<record id="product_template_5" model="product.template">
<field name="name">PC Assemble + Custom (PC on Demand)</field>
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">600.0</field>
<field name="list_price">900.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Custom computer assembled on order based on customer's requirement.</field>
</record>
<record id="product_product_5" model="product.product">
<field name="product_tmpl_id" ref="product_template_5"/>
<field name="product_tmpl_id" ref="product_template_3"/>
<field name="default_code">PC-DEM</field>
<field name="variants">Custom</field>
<field name="price_extra">450.0</field>
<field name="description">Custom computer assembled on order based on customer's requirement.</field>
</record>
<record id="product_template_6" model="product.template">
<field name="name">15” LCD Monitor</field>
<field name="name">LCD Monitor</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">800.0</field>
<field name="list_price">1200.0</field>
@@ -159,27 +144,23 @@ HDD SH-1</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_6" model="product.product">
<field name="product_tmpl_id" ref="product_template_6"/>
<field name="default_code">LCD15</field>
<field name="variants">15inch</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_7" model="product.template">
<field name="name">17” LCD Monitor</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">880.0</field>
<field name="list_price">1350.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_7" model="product.product">
<field name="product_tmpl_id" ref="product_template_7"/>
<field name="product_tmpl_id" ref="product_template_6"/>
<field name="default_code">LCD17</field>
<field name="variants">17inch</field>
<field name="price_extra">150.0</field>
</record>
<record id="product_template_8" model="product.template">
<field name="name">USB Keyboard, QWERTY</field>
<field name="name">USB Keyboard</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">10.0</field>
<field name="list_price">13.0</field>
@@ -190,24 +171,19 @@ HDD SH-1</field>
<record id="product_product_8" model="product.product">
<field name="product_tmpl_id" ref="product_template_8"/>
<field name="default_code">KeyQ</field>
<field name="variants">QWERTY</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_9" model="product.template">
<field name="name">USB Keyboard, AZERTY</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">10.0</field>
<field name="list_price">13.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_9" model="product.product">
<field name="product_tmpl_id" ref="product_template_9"/>
<field name="product_tmpl_id" ref="product_template_8"/>
<field name="default_code">KeyA</field>
<field name="variants">AZERTY</field>
<field name="price_extra">5.0</field>
</record>
<record id="product_template_10" model="product.template">
<field name="name">Mouse, Optical</field>
<field name="name">Mouse</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">12.50</field>
<field name="list_price">14</field>
@@ -218,38 +194,26 @@ HDD SH-1</field>
<record id="product_product_10" model="product.product">
<field name="product_tmpl_id" ref="product_template_10"/>
<field name="default_code">M-Opt</field>
<field name="variants">Optical</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_11" model="product.template">
<field name="name">Mouse, Laser</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">14</field>
<field name="list_price">16.50</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_11" model="product.product">
<field name="product_tmpl_id" ref="product_template_11"/>
<field name="product_tmpl_id" ref="product_template_10"/>
<field name="default_code">M-Las</field>
<field name="variants">Laser</field>
<field name="price_extra">2.50</field>
</record>
<record id="product_template_12" model="product.template">
<field name="name">Mouse, Wireless</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">18</field>
<field name="list_price">12.50</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_12" model="product.product">
<field name="product_tmpl_id" ref="product_template_12"/>
<field name="product_tmpl_id" ref="product_template_10"/>
<field name="default_code">M-Wir</field>
<field name="variants">Wireless</field>
<field name="price_extra">1.50</field>
</record>
<record id="product_template_13" model="product.template">
<field name="name">RAM SR5</field>
<field name="name">RAM</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">78.0</field>
<field name="list_price">85.0</field>
@@ -260,34 +224,22 @@ HDD SH-1</field>
<record id="product_product_13" model="product.product">
<field name="product_tmpl_id" ref="product_template_13"/>
<field name="default_code">RAM-SR5</field>
<field name="variants">1GB-SR5</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_14" model="product.template">
<field name="name">RAM SR2</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">87.0</field>
<field name="list_price">95.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_14" model="product.product">
<field name="product_tmpl_id" ref="product_template_14"/>
<field name="product_tmpl_id" ref="product_template_13"/>
<field name="default_code">RAM-SR2</field>
<field name="variants">2GB-SR2</field>
<field name="price_extra">10.0</field>
</record>
<record id="product_template_15" model="product.template">
<field name="name">RAM SR3</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">80.0</field>
<field name="list_price">85.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_15" model="product.product">
<field name="product_tmpl_id" ref="product_template_15"/>
<field name="product_tmpl_id" ref="product_template_13"/>
<field name="default_code">RAM-SR3</field>
<field name="variants">1GB-SR3</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_16" model="product.template">
@@ -305,7 +257,7 @@ HDD SH-1</field>
</record>
<record id="product_template_17" model="product.template">
<field name="name">HDD SH-1</field>
<field name="name">Hard Disk Drive</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">860.0</field>
<field name="list_price">975.0</field>
@@ -316,39 +268,27 @@ HDD SH-1</field>
<record id="product_product_17" model="product.product">
<field name="product_tmpl_id" ref="product_template_17"/>
<field name="default_code">HDD-SH1</field>
<field name="variants">180GB-SH1</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_18" model="product.template">
<field name="name">HDD SH-2</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1020.0</field>
<field name="list_price">1150.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_18" model="product.product">
<field name="product_tmpl_id" ref="product_template_18"/>
<field name="product_tmpl_id" ref="product_template_17"/>
<field name="default_code">HDD-SH2</field>
<field name="variants">180GB-SH2</field>
<field name="price_extra">175.0</field>
</record>
<record id="product_template_19" model="product.template">
<field name="name">HDD on Demand</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1100.0</field>
<field name="list_price">1250.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">On demand hard-disk having capacity based on requirement.</field>
</record>
<record id="product_product_19" model="product.product">
<field name="product_tmpl_id" ref="product_template_19"/>
<field name="product_tmpl_id" ref="product_template_17"/>
<field name="default_code">HDD-DEM</field>
<field name="variants">On Demand</field>
<field name="price_extra">275.0</field>
<field name="description">On demand hard-disk having capacity based on requirement.</field>
</record>
<record id="product_template_20" model="product.template">
<field name="name">Motherboard I9P57</field>
<field name="name">Motherboard</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1700.0</field>
<field name="list_price">1950.0</field>
@@ -359,20 +299,15 @@ HDD SH-1</field>
<record id="product_product_20" model="product.product">
<field name="product_tmpl_id" ref="product_template_20"/>
<field name="default_code">MBi9</field>
<field name="variants">I9P57</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_21" model="product.template">
<field name="name">Motherboard A20Z7</field>
<field name="categ_id" ref="product_category_8"/>
<field name="standard_price">1790.0</field>
<field name="list_price">2000.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_21" model="product.product">
<field name="product_tmpl_id" ref="product_template_21"/>
<field name="product_tmpl_id" ref="product_template_20"/>
<field name="default_code">MBa20</field>
<field name="variants">A20Z7</field>
<field name="price_extra">50.0</field>
</record>
<record id="product_template_22" model="product.template">
@@ -418,54 +353,42 @@ HDD SH-1</field>
</record>
<record id="product_template_25" model="product.template">
<field name="name">Laptop E5023</field>
<field name="name">Laptop</field>
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">2870.0</field>
<field name="list_price">2950.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_25" model="product.product">
<field name="product_tmpl_id" ref="product_template_25"/>
<field name="default_code">LAP-E5</field>
<field name="variants">E5023</field>
<field name="price_extra">0.0</field>
<field name="description">17" Monitor
4GB RAM
Standard-1294P Processor
QWERTY keyboard</field>
</record>
<record id="product_product_25" model="product.product">
<field name="product_tmpl_id" ref="product_template_25"/>
<field name="default_code">LAP-E5</field>
</record>
<record id="product_template_26" model="product.template">
<field name="name">Laptop S3450</field>
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">3000.0</field>
<field name="list_price">3245.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<record id="product_product_26" model="product.product">
<field name="product_tmpl_id" ref="product_template_25"/>
<field name="default_code">LAP-S3</field>
<field name="variants">S3450</field>
<field name="price_extra">295.0</field>
<field name="description">17" Monitor
6GB RAM
Hi-Speed 234Q Processor
QWERTY keyboard</field>
</record>
<record id="product_product_26" model="product.product">
<field name="product_tmpl_id" ref="product_template_26"/>
<field name="default_code">LAP-S3</field>
</record>
<record id="product_template_27" model="product.template">
<field name="name">Laptop Customized</field>
<field name="categ_id" ref="product_category_4"/>
<field name="standard_price">3300.0</field>
<field name="list_price">3645.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Custom Laptop based on customer's requirement.</field>
</record>
<record id="product_product_27" model="product.product">
<field name="product_tmpl_id" ref="product_template_27"/>
<field name="product_tmpl_id" ref="product_template_25"/>
<field name="default_code">LAP-CUS</field>
<field name="variants">Customized</field>
<field name="price_extra">695.0</field>
<field name="description">Custom Laptop based on customer's requirement.</field>
</record>
<record id="product_template_28" model="product.template">
@@ -484,7 +407,7 @@ QWERTY keyboard</field>
<record id="product_template_29" model="product.template">
<field name="name">Pen drive, SP-2</field>
<field name="name">Pen Drive, SP-2</field>
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">90.0</field>
<field name="list_price">100.0</field>
@@ -495,21 +418,16 @@ QWERTY keyboard</field>
<record id="product_product_29" model="product.product">
<field name="product_tmpl_id" ref="product_template_29"/>
<field name="default_code">PD-SP2</field>
<field name="variants">4GB-SP2</field>
<field name="price_extra">0.0</field>
</record>
<record id="product_template_30" model="product.template">
<field name="name">Pen drive, SP-4</field>
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">126.0</field>
<field name="list_price">145.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
</record>
<record id="product_product_30" model="product.product">
<field name="product_tmpl_id" ref="product_template_30"/>
<field name="product_tmpl_id" ref="product_template_29"/>
<field name="default_code">PD-SP4</field>
<field name="variants">8GB-SP4</field>
<field name="price_extra">45</field>
</record>
<record id="product_template_31" model="product.template">
@@ -528,33 +446,28 @@ QWERTY keyboard</field>
</record>
<record id="product_template_32" model="product.template">
<field name="name">Headset standard</field>
<field name="name">Headset</field>
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">57.0</field>
<field name="list_price">62.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
</record>
<record id="product_product_32" model="product.product">
<field name="product_tmpl_id" ref="product_template_32"/>
<field name="default_code">HEAD</field>
<field name="variants">Standard</field>
<field name="price_extra">0.0</field>
<field name="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
</record>
<record id="product_template_33" model="product.template">
<field name="name">Headset USB</field>
<field name="categ_id" ref="product_category_7"/>
<field name="standard_price">60.0</field>
<field name="list_price">65.0</field>
<field name="type">consu</field>
<field name="uom_id" ref="product_uom_unit"/>
<field name="uom_po_id" ref="product_uom_unit"/>
<field name="description">Headset for laptop PC with USB connector.</field>
</record>
<record id="product_product_33" model="product.product">
<field name="product_tmpl_id" ref="product_template_33"/>
<field name="product_tmpl_id" ref="product_template_32"/>
<field name="default_code">HEAD-USB</field>
<field name="variants">USB</field>
<field name="price_extra">30.0</field>
<field name="description">Headset for laptop PC with USB connector.</field>
</record>
@@ -804,20 +717,6 @@ QWERTY keyboard</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_3" model="product.supplierinfo">
<field name="product_id" ref="product_template_7"/>
<field name="name" ref="base.res_partner_1"/>
<field name="delay">3</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_4" model="product.supplierinfo">
<field name="product_id" ref="product_template_7"/>
<field name="name" ref="base.res_partner_4"/>
<field name="delay">3</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_5" model="product.supplierinfo">
<field name="product_id" ref="product_template_8"/>
<field name="name" ref="base.res_partner_16"/>
@@ -839,13 +738,6 @@ QWERTY keyboard</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_8" model="product.supplierinfo">
<field name="product_id" ref="product_template_11"/>
<field name="name" ref="base.res_partner_16"/>
<field name="delay">2</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_9" model="product.supplierinfo">
<field name="product_id" ref="product_template_13"/>
<field name="name" ref="base.res_partner_4"/>
@@ -853,22 +745,8 @@ QWERTY keyboard</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_10" model="product.supplierinfo">
<field name="product_id" ref="product_template_14"/>
<field name="name" ref="base.res_partner_4"/>
<field name="delay">5</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_11" model="product.supplierinfo">
<field name="product_id" ref="product_template_15"/>
<field name="name" ref="base.res_partner_4"/>
<field name="delay">5</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_12" model="product.supplierinfo">
<field name="product_id" ref="product_template_15"/>
<field name="product_id" ref="product_template_13"/>
<field name="name" ref="base.res_partner_1"/>
<field name="delay">1</field>
<field name="min_qty">1</field>
@@ -902,20 +780,6 @@ QWERTY keyboard</field>
<field name="min_qty">5</field>
</record>
<record id="product_supplierinfo_17" model="product.supplierinfo">
<field name="product_id" ref="product_template_21"/>
<field name="name" ref="base.res_partner_4"/>
<field name="delay">3</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_18" model="product.supplierinfo">
<field name="product_id" ref="product_template_21"/>
<field name="name" ref="base.res_partner_16"/>
<field name="delay">2</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_19" model="product.supplierinfo">
<field name="product_id" ref="product_template_22"/>
<field name="name" ref="base.res_partner_19"/>
@@ -944,13 +808,6 @@ QWERTY keyboard</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_23" model="product.supplierinfo">
<field name="product_id" ref="product_template_26"/>
<field name="name" ref="base.res_partner_1"/>
<field name="delay">8</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_24" model="product.supplierinfo">
<field name="product_id" ref="product_template_28"/>
<field name="name" ref="base.res_partner_19"/>
@@ -972,13 +829,6 @@ QWERTY keyboard</field>
<field name="min_qty">12</field>
</record>
<record id="product_supplierinfo_27" model="product.supplierinfo">
<field name="product_id" ref="product_template_30"/>
<field name="name" ref="base.res_partner_3"/>
<field name="delay">2</field>
<field name="min_qty">12</field>
</record>
<record id="product_supplierinfo_28" model="product.supplierinfo">
<field name="product_id" ref="product_template_31"/>
<field name="name" ref="base.res_partner_3"/>
@@ -1056,55 +906,27 @@ QWERTY keyboard</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_39" model="product.supplierinfo">
<field name="product_id" ref="product_template_18"/>
<field name="name" ref="base.res_partner_19"/>
<field name="delay">4</field>
<field name="min_qty">1</field>
</record>
<record id="product_supplierinfo_40" model="product.supplierinfo">
<field name="product_id" ref="product_template_19"/>
<field name="product_id" ref="product_template_17"/>
<field name="name" ref="base.res_partner_1"/>
<field name="delay">4</field>
<field name="min_qty">0</field>
</record>
<record id="product_supplierinfo_41" model="product.supplierinfo">
<field name="product_id" ref="product_template_19"/>
<field name="product_id" ref="product_template_17"/>
<field name="name" ref="base.res_partner_8"/>
<field name="delay">5</field>
<field name="min_qty">0</field>
</record>
<record id="product_supplierinfo_42" model="product.supplierinfo">
<field name="product_id" ref="product_template_33"/>
<field name="name" ref="base.res_partner_3"/>
<field name="delay">2</field>
<field name="min_qty">0</field>
</record>
<record id="product_supplierinfo_43" model="product.supplierinfo">
<field name="product_id" ref="product_template_9"/>
<field name="name" ref="base.res_partner_8"/>
<field name="delay">4</field>
<field name="min_qty">0</field>
</record>
<record id="product_supplierinfo_44" model="product.supplierinfo">
<field name="product_id" ref="product_template_27"/>
<field name="product_id" ref="product_template_25"/>
<field name="name" ref="base.res_partner_1"/>
<field name="delay">10</field>
<field name="min_qty">0</field>
</record>
<record id="product_supplierinfo_45" model="product.supplierinfo">
<field name="product_id" ref="product_template_12"/>
<field name="name" ref="base.res_partner_16"/>
<field name="delay">3</field>
<field name="min_qty">0</field>
</record>
<record id="product_supplierinfo_46" model="product.supplierinfo">
<field name="product_id" ref="product_template_37"/>
<field name="name" ref="base.res_partner_22"/>
addons/product/product_image_demo.xml
+128 -124
View File
File diff suppressed because one or more lines are too long
addons/product/product_view.xml
+4 -4
View File
@@ -83,7 +83,7 @@
<group>
<field name="type"/>
<field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
<field name="list_price"/>
<field name="list_price" string="Sale Price of Template"/>
</group>
<group>
<field name="default_code"/>
@@ -100,7 +100,7 @@
<group name="procurement">
<group name="general">
<field name="cost_method" groups="product.group_costing_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
<field name="standard_price" string="Cost Price of Template" attrs="{'readonly':[('cost_method','=','average')]}"/>
</group>
<group name="procurement_uom" groups="product.group_uom" string="Purchase">
<field name="uom_po_id"/>
@@ -784,7 +784,7 @@
<field name="state"/>
<field name="product_manager"/>
</group>
<group string="Weights">
<group name ="weight" string="Weights">
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
@@ -793,7 +793,7 @@
</page>
<page string="Sales" attrs="{'invisible':[('sale_ok','=',False)]}">
<group name="sale">
<group string="Sale Conditions">
<group name="sale_condition" string="Sale Conditions">
<label for="warranty"/>
<div>
<field name="warranty" class="oe_inline" style="vertical-align:baseline"/> months
addons/product/test/compute_price_margin.yml
+25
View File
@@ -0,0 +1,25 @@
-
I create a Product Template.
-
!record {model: product.template, id: product_template_test1}:
name: Tablate PC
type: service
categ_id: product_category_8
uom_id: product_uom_unit
uom_po_id: product_uom_unit
-
I create product variant, set price margin and price extra.
-
!record {model: product.product, id: product_product_test1}:
product_tmpl_id: product_template_test1
standard_price: 10.0
list_price: 20.0
variants: 2GB, Wi-Fi , 6in
price_margin: 10.0
price_extra: 20.0
-
I check that the sale price of product is equal to (20 + ((20 * 10) / 100)) + 20.
-
!python {model: product.product}: |
product = self.browse(cr, uid, ref("product_product_test1"))
assert product.lst_price == (20 + ((20 * 10) / 100)) + 20, "Sell price is not correspond."
addons/sale/sale_demo.xml
+5 -2
View File
@@ -318,7 +318,7 @@ Thanks!</field>
<!-- sale advance demo.. -->
<!-- Demo Data for Product -->
<record id="advance_product_0" model="product.product">
<record id="advance_template_0" model="product.template">
<field name="name">Advance</field>
<field name="categ_id" ref="product.product_category_1"/>
<field name="type">service</field>
@@ -330,7 +330,10 @@ Thanks!</field>
<field name="company_id" eval="[]"/>
<field name="image">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</field>
</record>
<record id="advance_product_0" model="product.product">
<field name="product_tmpl_id" ref="advance_template_0"/>
</record>
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
</record>
addons/sale/test/sale_order_demo.yml
+2 -2
View File
@@ -17,7 +17,7 @@
I verify that the onchange was correctly triggered
-
!assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
- order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
- order_line[0].name == u'[LCD17] LCD Monitor - 17inch'
- order_line[0].price_unit == 1350.0
- order_line[0].product_uom_qty == 8
- order_line[0].product_uom.id == ref('product.product_uom_unit')
@@ -35,7 +35,7 @@
I verify that the onchange was correctly triggered
-
!assert {model: sale.order, id: sale.sale_order_test2, string: The onchange function of product was not correctly triggered}:
- order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
- order_line[0].name == u'[LCD17] LCD Monitor - 17inch'
- order_line[0].price_unit == 1350.0 * 12
- order_line[0].product_uom.id == ref('product.product_uom_dozen')
- order_line[0].product_uom_qty == 16
addons/stock/product_view.xml
+3 -3
View File
@@ -37,7 +37,7 @@
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_form_view"/>
<field name="arch" type="xml">
<xpath expr="//group[@string='Sale Conditions']" position="inside">
<xpath expr="//group[@name='sale_condition']" position="inside">
<label for="sale_delay"/>
<div>
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',False)]}" class="oe_inline" style="vertical-align:baseline"/> days
@@ -50,7 +50,7 @@
<field name="loc_case"/>
</group>
</xpath>
<xpath expr="//group[@string='Weights']" position="after">
<xpath expr="//group[@name='weight']" position="after">
<group string="Accounting Entries">
<field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -139,7 +139,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<field name="standard_price" position="replace" version="7.0">
<label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
<label string="Cost Price of Template" for="standard_price" align="1.0" groups="base.group_user"/>
<div groups="base.group_user">
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
<button name="%(action_view_change_standard_price)d" string="- update"