Commit Graph

165 Commits

Author SHA1 Message Date
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Olivier Dony 6de0051315 [FIX] product: support string values for context `pricelist` key when computing prices
As of v7 search views will replace the value of any `self`
      literal in a @context attribute by the name of the
      record, whereas it used to be its ID.
      This means that the `Pricelist` filter used to display
      the product list with a specific pricelist would not
      work anymore.
      
      The fix requires a rather hackish name_search()
      override for product.pricelist because the display
      name of pricelists includes their currency, while
      that could be a valid name for a pricelist too.
      
      To avoid side-effects the name_search() override
      only picks up the special case used by the
      product.product._product_price() method when it
      tries to apply the context pricelist, that is
      with operator explicitly set to `=` and no extra
      domain `args`.

lp bug: https://launchpad.net/bugs/1178835 fixed

bzr revid: odo@openerp.com-20130906155047-7dmozy2jpe1ca1p2
2013-09-06 17:50:47 +02:00
Quentin (OpenERP) 33f27b362b [MERGE] forward port of addons v7 up to revision 9045
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
Quentin (OpenERP) 27c3b6cc33 [MERGE][FIX] product: context propagating in res_currency.compute(). Courtesy of Yannick Vaucher @ Camptocamp. Thanks dude
bzr revid: qdp-launchpad@openerp.com-20130418141013-vukxknub32p7djqd
2013-04-18 16:10:13 +02:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Yannick Vaucher 5cb1835e26 [FIX] add missing context on compute call in pricelist price_get_multi context
lp bug: https://launchpad.net/bugs/1155624 fixed

bzr revid: yannick.vaucher@camptocamp.com-20130315142403-gz7fy7etwzls96rt
2013-03-15 15:24:03 +01:00
Josse Colpaert d02c984059 [FIX] Add tooltip for supplier prices
bzr revid: jco@openerp.com-20130321143459-qqain0zq8jgdhbbp
2013-03-21 15:34:59 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Vijaykumar Baladaniya 7850a91339 [IMP]Improve a tooltip.
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
pankita shah (Open ERP) 7edf7aa420 [IMP] hide label when click in 'based on' except 'other pricelist' and improve 'Other Pricelist'
bzr revid: shp@tinyerp.com-20121009063814-qm2kh936zfssojck
2012-10-09 12:08:14 +05:30
Fabien Pinckaers 1b094843b4 [FIX] partner name based on product's supplierinfo
bzr revid: fp@tinyerp.com-20120930103851-l762lyqdw3awjxlr
2012-09-30 12:38:51 +02:00
Fabien Pinckaers 859450d0c8 [FIX] margins in pricelists
bzr revid: fp@tinyerp.com-20120926082250-izv3jk874780htt8
2012-09-26 10:22:50 +02:00
Divyesh Makwana (Open ERP) 28063542d6 [ADD] product : Added a constraint to check 'Min margin' and 'Max margin'.
bzr revid: mdi@tinyerp.com-20120925114822-ahjtslxh1g0inypw
2012-09-25 17:18:22 +05:30
Divyesh Makwana (Open ERP) 26ba2b8c0f [IMP] product : Improved the tooltip.
bzr revid: mdi@tinyerp.com-20120925101850-q9soju7mvol43eyo
2012-09-25 15:48:50 +05:30
Divyesh Makwana (Open ERP) 6a5f24f92d [IMP] product : Improved the tooltip.
bzr revid: mdi@tinyerp.com-20120925100457-o1yw9k2opljaz4m6
2012-09-25 15:34:57 +05:30
Divyesh Makwana (Open ERP) 5d910cc881 [IMP] product : Override create and write method in order to check 'Min margin' and 'Max margin'.
bzr revid: mdi@tinyerp.com-20120925072701-6nus286naxzujp1e
2012-09-25 12:57:01 +05:30
Divyesh Makwana (Open ERP) 974935a6f8 [IMP] product : Override create and write method in order to check 'Min margin' and 'Max margin'.
bzr revid: mdi@tinyerp.com-20120925071137-dchr17sj1nzxginy
2012-09-25 12:41:37 +05:30
Divyesh Makwana (Open ERP) 2ea34c71f8 [IMP] product : Override create and write method in order to check 'Min margin' and 'Max margin'.
bzr revid: mdi@tinyerp.com-20120925065619-g2n8h78ioou3q7ch
2012-09-25 12:26:19 +05:30
Divyesh Makwana (Open ERP) fc9b27af79 [IMP] product : Improved the warning message.
bzr revid: mdi@tinyerp.com-20120924130043-euwxbfmk5q58vqw4
2012-09-24 18:30:43 +05:30
Divyesh Makwana (Open ERP) 3bcf43b06b [ADD] product : Override create method in order to check 'Min margin' and 'Max margin'.
bzr revid: mdi@tinyerp.com-20120924121542-0031rv1ozrxlvc9a
2012-09-24 17:45:42 +05:30
Divyesh Makwana (Open ERP) 8957669dca [ADD] product : Improved the warning message.
bzr revid: mdi@tinyerp.com-20120924114420-qy1lviihna6odv6e
2012-09-24 17:14:20 +05:30
Divyesh Makwana (Open ERP) d306cc49c8 [ADD] product : Override write method in order to check 'Min margin' and 'Max margin'.
bzr revid: mdi@tinyerp.com-20120924113357-195gynto9xm7ae2a
2012-09-24 17:03:57 +05:30
Divyesh Makwana (Open ERP) d4013af9e5 [IMP] product : Improved onchange on min/max margin value.
bzr revid: mdi@tinyerp.com-20120924095322-jtgzlxkohon6qc6y
2012-09-24 15:23:22 +05:30
Divyesh Makwana (Open ERP) eb1ca68128 [IMP] product : Improved onchange on min/max margin value.
bzr revid: mdi@tinyerp.com-20120924085503-ckhxdgcvqb0h6qjh
2012-09-24 14:25:03 +05:30
Divyesh Makwana (Open ERP) e8060bc72e [REM] product : Removed constraint on min/max margin value.
bzr revid: mdi@tinyerp.com-20120924084536-r429tvqy9jhjytjo
2012-09-24 14:15:36 +05:30
Divyesh Makwana (Open ERP) e708ec5345 [IMP] product : Added warning message on onchange of min/max margin value.
bzr revid: mdi@tinyerp.com-20120924084242-v6cly3hpsotn2y4b
2012-09-24 14:12:42 +05:30
Divyesh Makwana (Open ERP) d86cc61f08 [ADD] product : Added warning message on onchange of min/max margin value.
bzr revid: mdi@tinyerp.com-20120924073126-ejkeieiz81zc1udo
2012-09-24 13:01:26 +05:30
Divyesh Makwana (Open ERP) c31eb654b2 [ADD] Added a tooltip for pricelist rule.
bzr revid: mdi@tinyerp.com-20120919110540-w4jdpozlsk173gv3
2012-09-19 16:35:40 +05:30
Divyesh Makwana (Open ERP) 527e1558c9 [ADD] product : Added a constraint to check Minimum Margin must be lower than Maximum Margin.
bzr revid: mdi@tinyerp.com-20120919094751-3pjr3h9cuar3wgh5
2012-09-19 15:17:51 +05:30
Amit (OpenERP) 5d4ffef43e [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120824115723-0053kjqpdkx7vsde
2012-08-24 17:27:23 +05:30
Quentin (OpenERP) 1232812cc6 [MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
2012-08-14 16:10:40 +02:00
Antonin Bourguignon 59aa37f0e4 [IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Benoit Guillot dc3ae0488b [IMP] replace 'Price Unit name by 'Product Price'
bzr revid: benoit.guillot@akretion.com.br-20120711130615-25ascb8dfllo4r7j
2012-07-11 15:06:15 +02:00
Benoit Guillot 7cb6f34e88 [REF] remove sale and purchase precision and replace it by price unit precision. Add discount precision.
bzr revid: benoit.guillot@akretion.com.br-20120710122401-mt3fvdlqy7d2zz5y
2012-07-10 14:24:01 +02:00
Alexis de Lattre 36cb6f479a Use product.product instead of product.template when we go through the ORM.
In this process, I re-wrote the fonction change_product_qty_send_note in stock/wizard/stock_change_product_qty.py : the code is now much better !

bzr revid: alexis@via.ecp.fr-20120709162124-jmqv7hrl94fbzk1j
2012-07-09 18:21:24 +02:00
jose 6fcb0fe62b [FIX] Pricelist: Fixes the problem on pricelist when template_id doesn't same with product_id
lp bug: https://launchpad.net/bugs/997898 fixed

bzr revid: amp@tinyerp.com-20120514070910-te6blf2bdmd5j2a5
2012-05-14 12:39:10 +05:30
Harry (OpenERP) 5e62369fd0 [MERGE] product: cleanup yml
bzr revid: hmo@tinyerp.com-20120105122219-r7m9pbeyihr2qz0i
2012-01-05 17:52:19 +05:30
Quentin (OpenERP) 9d46209011 [REF] product/pricelist.py: removed deprecated and unused function price_get_old()
bzr revid: qdp-launchpad@openerp.com-20111116114757-yts9zrzuduh6z6ao
2011-11-16 12:47:57 +01:00
Quentin (OpenERP) 46adb7901f [MERGE] lp: 860625 (pricelist item wrongly chosen when based on partner section of product form). Courtesy of Numerigraphe
bzr revid: qdp-launchpad@openerp.com-20111116114039-4i8jge9e36v3umbc
2011-11-16 12:40:39 +01:00
Numerigraphe - Lionel Sausin c13d18d93b [FIX] Only consider pricelist items based on partner if we have a partner and it's on the product's supplier info
lp bug: https://launchpad.net/bugs/860625 fixed

bzr revid: ls@numerigraphe.fr-20110928153434-5qd9lbk6i2dm2f5l
2011-09-28 17:34:34 +02:00
ron@tinyerp.com f919ba5a5e [IMP]product: Removed list(set(pricelist_ids)) from price_get_multi
bzr revid: ron@tinyerp.com-20110913125434-0k4xemeu9z4gh52t
2011-09-13 18:24:34 +05:30
ron@tinyerp.com dea102e094 [IMP]product: Improved code of price_multi_get
bzr revid: ron@tinyerp.com-20110913122152-mpzjcuvqy7xh1rzh
2011-09-13 17:51:52 +05:30
ron@tinyerp.com 4b1f2b9142 [FIX]product: Improved Variable naming in - price_get_multi in pricelist.py and optimized code
lp bug: https://launchpad.net/bugs/847605 fixed

bzr revid: ron@tinyerp.com-20110913060150-o82qynbndp3alnm0
2011-09-13 11:31:50 +05:30
Quentin (OpenERP) b40383f099 [MERGE] lp:742100
bzr revid: qdp-launchpad@openerp.com-20110518161317-94ohmoiq5mqtrfrj
2011-05-18 18:13:17 +02:00
Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk.

bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
Jay Vora (OpenERP) cacca76c57 [MERGE] Merged Anup's branch for the fix of invoice created for analyric lines(case 5267). This also covers the fix for the bug lp:728092. Pricelist calculation corrected
lp bug: https://launchpad.net/bugs/728092 fixed

bzr revid: jvo@tinyerp.com-20110421074529-7p3ts8v1w285jzmg
2011-04-21 13:15:29 +05:30
Anup (OpenERP) 58a9ccd223 [FIX] product,hr_timesheet_invoice : Invoicing analytic lines(timesheet lines) were calculating wrong prices for product (Support SaaS Case : 5267)
bzr revid: ach@tinyerp.com-20110419073135-az6tvqgfbepkr94c
2011-04-19 13:01:35 +05:30
Rifakat bf93263cc3 [FIX] Product : Corrected the calculation of pricelist when the option is 'Partner section of the product form'
lp bug: https://launchpad.net/bugs/727162 fixed

bzr revid: jvo@tinyerp.com-20110413175903-k4h01lsy3aki3ytd
2011-04-13 23:29:03 +05:30
Jay Vora (OpenERP) 4a5f76f7e6 [FIX] Product : Correcter pricelist calculation if base price set to 0
lp bug: https://launchpad.net/bugs/710521 fixed

bzr revid: jvo@tinyerp.com-20110408140130-uc06lphwpp5xnd04
2011-04-08 19:31:30 +05:30
ron@tinyerp.com 53cad5a3bf [FIX]sale: wrong price calculation when changing UoM and pricelist based on other pricelist
lp bug: https://launchpad.net/bugs/742100 fixed

bzr revid: ron@tinyerp.com-20110331112206-5ww6yrqyc3y88yzw
2011-03-31 16:52:06 +05:30