Commit Graph
69 Commits
Author SHA1 Message Date
Darshan Kalola (OpenERP) b67042a635 [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140131045931-mk74uyydsjp761hg
2014-01-31 10:29:31 +05:30
Darshan Kalola (OpenERP) 40d0af06b2 [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140124064653-f92c75suuyzru0eq
2014-01-24 12:16:53 +05:30
Darshan Kalola (OpenERP) 9ce241349f [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution.
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
2014-01-21 11:16:38 +05:30
Darshan Kalola (OpenERP) 69e88b3fec []
bzr revid: dka@tinyerp.com-20140117140940-kghgmrrndd82pheg
2014-01-17 19:39:40 +05:30
Darshan Kalola (OpenERP) b3248f9db9 [IMP]passed template id instead of product id in website url.
bzr revid: dka@tinyerp.com-20140117123740-w7mtferx8jejy1fl
2014-01-17 18:07:40 +05:30
Darshan Kalola (OpenERP) 8cfd06f449 [IMP]product: removed product by template menu and action.
bzr revid: dka@tinyerp.com-20140117113910-csv71potcxaklem5
2014-01-17 17:09:10 +05:30
Darshan Kalola (OpenERP) 82cdf9e4c0 [IMP]product: removed unnecessary code from onchange_product_tmpl_id and improved indentation in template form view.
bzr revid: dka@tinyerp.com-20140117110544-y7lc0t2xc0bb6403
2014-01-17 16:35:44 +05:30
Darshan Kalola (OpenERP) 19bc4842c5 [REMOVE]test case of price margin.
bzr revid: dka@tinyerp.com-20140117101353-vbi7u3wfom0dep6j
2014-01-17 15:43:53 +05:30
Darshan Kalola (OpenERP) 132933f991 [IMP]revert margin calculation.
bzr revid: dka@tinyerp.com-20140117100627-s65f1jlv93h4w3p1
2014-01-17 15:36:27 +05:30
Darshan Kalola (OpenERP) 86ec8bd39a [IMP]removed unnecessary code.
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
Darshan Kalola (OpenERP) effa6b282e [IMP]product: removed attrs from variants in form view.
bzr revid: dka@tinyerp.com-20140117075805-r5k1epe8vzj36tzm
2014-01-17 13:28:05 +05:30
Darshan Kalola (OpenERP) f75f2eccef [IMP]improved template view in website_sale.
bzr revid: dka@tinyerp.com-20140117073308-wcyg4q60aj187wek
2014-01-17 13:03:08 +05:30
Darshan Kalola (OpenERP) 21c54c95a2 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.
bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
2014-01-17 12:30:28 +05:30
Darshan Kalola (OpenERP) 5d770d4b6f [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
2014-01-16 20:23:07 +05:30
Darshan Kalola (OpenERP) fcf6109d16 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140116120607-rkfs8qysinmegp54
2014-01-16 17:36:07 +05:30
Darshan Kalola (OpenERP) 4e3bed270e [IMP]improved product template in website_sale.
bzr revid: dka@tinyerp.com-20140116120100-m305tam84zvjh0fw
2014-01-16 17:31:00 +05:30
Darshan Kalola (OpenERP) 27da32873e [IMP]put domainin ecommerce_get_product_domain method of website to restrict the product_template which has not variants(ecommerce view).
bzr revid: dka@tinyerp.com-20140116093347-tz9mn24r01xbfdp0
2014-01-16 15:03:47 +05:30
Darshan Kalola (OpenERP) 79778888e7 [IMP]improved test case in compute_price_margin.
bzr revid: dka@tinyerp.com-20140116084128-4g5cqtuf6bqf9mh8
2014-01-16 14:11:28 +05:30
Darshan Kalola (OpenERP) acde6d86c1 [IMP]rename has_variants field to standard_variants in product form and improved fields_view_get method.
bzr revid: dka@tinyerp.com-20140116074535-m40q8q7dy3kzfguf
2014-01-16 13:15:35 +05:30
Darshan Kalola (OpenERP) a8fe8ac44f [IMP]added onchange method on product_tmpl_id and added standard_variants function field to check the number of variants, improved view of product and removed unneccessary code.
bzr revid: dka@tinyerp.com-20140116072118-0xccl7mkdqbpdggb
2014-01-16 12:51:18 +05:30
Darshan Kalola (OpenERP) 90248025a4 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140115144940-srkv28a758ov0xx8
2014-01-15 20:19:40 +05:30
Darshan Kalola (OpenERP) d4460bf323 [IMP]product template: put context 'search_variants' in action to hide a blank varinats and revert the revno 10025.
bzr revid: dka@tinyerp.com-20140115122723-we4y9wmn6pu36rh9
2014-01-15 17:57:23 +05:30
Darshan Kalola (OpenERP) 33af9858b5 [IMP]put ondelete='restrict' on product_tmpl_id to restrict deletion of product template if template having a variants.
bzr revid: dka@tinyerp.com-20140115113455-26aupx34va3b0km5
2014-01-15 17:04:55 +05:30
Darshan Kalola (OpenERP) b189887a46 [IMP]remove unnecessary yml change from point of sale and keep as it is.
bzr revid: dka@tinyerp.com-20140115094220-w708vknkeh913r9x
2014-01-15 15:12:20 +05:30
Darshan Kalola (OpenERP) a452ff9d90 [IMP]remove domain from product_variant_ids and improve view.
bzr revid: dka@tinyerp.com-20140115065949-8vnj4lvmsiq5vixr
2014-01-15 12:29:49 +05:30
Darshan Kalola (OpenERP) 67f6f54e73 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
2014-01-15 10:55:50 +05:30
Darshan Kalola (OpenERP) c103be840c [IMP]added test case for extra price and remove copy_translations method from product_product.
bzr revid: dka@tinyerp.com-20140109132515-my03lj9haj9ex90k
2014-01-09 18:55:15 +05:30
Darshan Kalola (OpenERP) 21db945b88 [IMP]Add fields_view_get method to make dynamic view of product.
bzr revid: dka@tinyerp.com-20140109103756-d5f37y2eyxjisvoo
2014-01-09 16:07:56 +05:30
Darshan Kalola (OpenERP) a9e87b56ce [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
Darshan Kalola (OpenERP) 8905f99445 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20131126062117-eljwkio3vaghy8xy
2013-11-26 11:51:17 +05:30
Darshan Kalola (OpenERP) d53dd95962 [ADD]demo data of Americanization units of measure and test case for the same.
bzr revid: dka@tinyerp.com-20131125111352-0dcg73dbk3tmca6k
2013-11-25 16:43:52 +05:30
Darshan Kalola (OpenERP) 9f2dce4fe0 [IMP]improve product template view and change necessary xpath
bzr revid: dka@tinyerp.com-20131122054850-8sfin7rypnyf17ip
2013-11-22 11:18:50 +05:30
Darshan Kalola (OpenERP) d67a267c39 [IMP]solve traceback.
bzr revid: dka@tinyerp.com-20131121130844-ywqfpx6aza6wuoia
2013-11-21 18:38:44 +05:30
Darshan Kalola (OpenERP) f19a433dbb [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and change necessary code.
bzr revid: dka@tinyerp.com-20131121122311-629hbtetmqfrtfyg
2013-11-21 17:53:11 +05:30
Darshan Kalola (OpenERP) 17a5f388eb [IMP]add variant group in product by template menu.
bzr revid: dka@tinyerp.com-20131121055920-fh4e2elnrdy3rz45
2013-11-21 11:29:20 +05:30
Darshan Kalola (OpenERP) e97c4924b7 [IMP]solve yml issue and improve unit price for invoice line.
bzr revid: dka@tinyerp.com-20131111132418-aeazzv8dkyaijgne
2013-11-11 18:54:18 +05:30
Darshan Kalola (OpenERP) 7237e7436b [MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb
bzr revid: dka@tinyerp.com-20131108134052-49pappgab0d7j49q
2013-11-08 19:10:52 +05:30
Darshan Kalola (OpenERP) 412ee4bd8a [IMP]add search view for product-variant,solve duplication problem of product variant and solve unit price calculation problem.
bzr revid: dka@tinyerp.com-20131108131416-cyqebxz9zgbjy9nj
2013-11-08 18:44:16 +05:30
Darshan Kalola (OpenERP) 50963cc810 [IMP]improve typo and solve the product duplication problem.
bzr revid: dka@tinyerp.com-20131101102528-21x66oz8wn5uxaq2
2013-11-01 15:55:28 +05:30
Darshan Kalola (OpenERP) d79ec7639e [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20131030104524-3y58k6mm9qgkxcyp
2013-10-30 16:15:24 +05:30
Darshan Kalola (OpenERP) 8210a9962e [IMP]improve test case and product form view.
bzr revid: dka@tinyerp.com-20131030103521-gmeyqdvug6nt4cd5
2013-10-30 16:05:21 +05:30
Darshan Kalola (OpenERP) 02dec945de [IMP]improve view,label and help of product.
bzr revid: dka@tinyerp.com-20131028090644-fkmxjbbu5pze5f7h
2013-10-28 14:36:44 +05:30
Darshan Kalola (OpenERP) bc14d3e659 [ADD]test case for computation of price margin.
bzr revid: dka@tinyerp.com-20131028053025-4h9ftnaqtmbzp2yl
2013-10-28 11:00:25 +05:30
Darshan Kalola (OpenERP) 0d9d1dcec7 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20131028045056-ks8dg2ftjz9vcpk3
2013-10-28 10:20:56 +05:30
Darshan Kalola (OpenERP) 9de8fe533d [IMP]improve name of product in sale/sale_order_demo yml.
bzr revid: dka@tinyerp.com-20131028044053-ewvotzso2c1mmrmv
2013-10-28 10:10:53 +05:30
Darshan Kalola (OpenERP) 162329ee4a [IMP]demo data of product and yml test of point of sale.
bzr revid: dka@tinyerp.com-20131025122415-b1cssqumzdowxjrb
2013-10-25 17:54:15 +05:30
Darshan Kalola (OpenERP) 4046977bb4 [solved]solved the yml traceback.
bzr revid: dka@tinyerp.com-20131025072654-mne6r9kdeww705h3
2013-10-25 12:56:54 +05:30
Darshan Kalola (OpenERP) 21bf32477f [IMP]demo data of product.
bzr revid: dka@tinyerp.com-20131025070047-d7drcy22lclon13d
2013-10-25 12:30:47 +05:30
Darshan Kalola (OpenERP) cfb4780369 [IMP]add image field and description field in product_product.
bzr revid: dka@tinyerp.com-20131024065805-lffcw1zq616dwv3m
2013-10-24 12:28:05 +05:30
Darshan Kalola (OpenERP) a54bdb0b27 [MERGE]merged with main addons.
bzr revid: dka@tinyerp.com-20131023112859-hetth94wbcwc37eq
2013-10-23 16:58:59 +05:30
Darshan Kalola (OpenERP) 9b8c247195 [MERGE] with main addons
bzr revid: dka@tinyerp.com-20131021060101-93g9tq6dcawhh8r8
2013-10-21 11:31:01 +05:30
Darshan Kalola (OpenERP) d97e7a6a4e [IMP]kanban view of product-template.
bzr revid: dka@tinyerp.com-20131018091710-mn1mhgx8m2ytixy3
2013-10-18 14:47:10 +05:30
Darshan Kalola (OpenERP) a96f1c21a8 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb.
bzr revid: dka@tinyerp.com-20131018085850-rgrrkiy0ir2ctxqe
2013-10-18 14:28:50 +05:30
Darshan Kalola (OpenERP) 1b336d74c6 [ADD]kanban view in product-template.
bzr revid: dka@tinyerp.com-20131015095414-aeu0zrmdoowkt1yy
2013-10-15 15:24:14 +05:30
Darshan Kalola (OpenERP) 09f40c5c8e [MERGE]with latest trunk
bzr revid: dka@tinyerp.com-20131015084724-0dac65ypf35j0hmu
2013-10-15 14:17:24 +05:30
Darshan Kalola (OpenERP) 90d676bc2a [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb.
bzr revid: dka@tinyerp.com-20131014102139-m63gux5j0pkjbfnj
2013-10-14 15:51:39 +05:30
Darshan Kalola (OpenERP) c1c71c522e [IMP]search,tree and kanban view of product and added search view of product template.
bzr revid: dka@tinyerp.com-20131014094614-m32bm0npqxblz1k0
2013-10-14 15:16:14 +05:30
Darshan Kalola (OpenERP) 3cb95d2227 [IMP] add menu Product Template and improve the form view of product template.
bzr revid: dka@tinyerp.com-20131011110641-q3dcnsfqihbjnfs1
2013-10-11 16:36:41 +05:30
Darshan Kalola (OpenERP) 3c77dc3018 [IMP]improve demo data of applicant and job postion in hr
bzr revid: dka@tinyerp.com-20130927103631-14esjbqvcg1ocrxc
2013-09-27 16:06:31 +05:30
Darshan Kalola (OpenERP) caf73f8a9d [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130926072238-gynh8bc3w10y8uwb
2013-09-26 12:52:38 +05:30
Darshan Kalola (OpenERP) 4da8f14e0c [IMP]add template_id in hr_recruitment_stage for mail functionality.
bzr revid: dka@tinyerp.com-20130920102818-xj7ua08i5406wi16
2013-09-20 15:58:18 +05:30
Darshan Kalola (OpenERP) 8175717f8b [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130918070456-sd7fkbk9wzh9dyue
2013-09-18 12:34:56 +05:30
Darshan Kalola (OpenERP) bfa265d287 [IMP]attached cv and discussion to demo data and linked demo data to job position and linked job postion to survey
bzr revid: dka@tinyerp.com-20130918062509-7g8ttro8rkj6sn3c
2013-09-18 11:55:09 +05:30
Darshan Kalola (OpenERP) d1a23edd2e [IMP]align multi-line string
bzr revid: dka@tinyerp.com-20130917130814-wikgcy25594gk8dx
2013-09-17 18:38:14 +05:30
Darshan Kalola (OpenERP) 21876a5810 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130917123814-wqx07inh0ckcqdgw
2013-09-17 18:08:14 +05:30
Darshan Kalola (OpenERP) e21681633c [IMP]add help,ipmrove code and remove duplication in record_ids
bzr revid: dka@tinyerp.com-20130909095957-a2gvivlto7qwv50x
2013-09-09 15:29:57 +05:30
Darshan Kalola (OpenERP) 691cb9cb25 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130906052126-j147w420snwytrn3
2013-09-06 10:51:26 +05:30
Darshan Kalola (OpenERP) b3e6145e04 [IMP]improve help in setting/configuration/sales
bzr revid: dka@tinyerp.com-20130830104524-pbxm2p32n1widzqd
2013-08-30 16:15:24 +05:30
Darshan Kalola (OpenERP) 80da7ddd60 [IMP]Add - before the the sentence This installs the module in help
bzr revid: dka@tinyerp.com-20130830094512-n3nqjtt1g0w8m94v
2013-08-30 15:15:12 +05:30