Commit Graph
81391 Commits
Author SHA1 Message Date
Christophe Matthieu 6b20e1baea [FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
bzr revid: chm@openerp.com-20131015132738-d1l7bb8vbndz5mu5
2013-10-15 15:27:38 +02:00
Christophe Matthieu 4724266802 [FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
bzr revid: chm@openerp.com-20131015125308-mzmq1p1nm1kfqd9g
2013-10-15 14:53:08 +02:00
bth-openerp 2aff4eba05 [IMP]Added partner's descriptions in demo data.
bzr revid: bth@tinyerp.com-20131015124141-hk1lq48y51fq5rhm
2013-10-15 18:11:41 +05:30
Amit Bhavsar (Open ERP) 84bde32a57 [MERGE] merge with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131015121142-hq7foz2jhrq2hi73
2013-10-15 17:41:42 +05:30
Martin Trigaux d36a90b39e [FIX] account: correctly compute debit/credit for partner including previous moves reported to new fiscal year
lp bug: https://launchpad.net/bugs/1219381 fixed

bzr revid: mat@openerp.com-20131015121015-jdwkzv9tjicg2m1u
2013-10-15 14:10:15 +02:00
Xavier Morel 41327fda79 [MERGE] from trunk after fonts have been added
bzr revid: xmo@openerp.com-20131015114534-bmuu05j125s9mbo9
2013-10-15 13:45:34 +02:00
Xavier Morel 777716d443 [MERGE] from trunk again
bzr revid: tde@openerp.com-20131002143826-xtzkkfr0rratuyxf
bzr revid: tde@openerp.com-20131004092146-vp406nv0xb0hdav9
bzr revid: tde@openerp.com-20131007081238-j860nrdzx8ldspto
bzr revid: tde@openerp.com-20131011075756-utfeqy4ws0linucc
bzr revid: xmo@openerp.com-20131015110940-8wkrblhf576h3cbj
bzr revid: xmo@openerp.com-20131015112458-vtukdpa6svjc19w3
2013-10-15 13:24:58 +02:00
Xavier Morel ee4802b1b7 [ADD] forgot a file in previous commit
bzr revid: xmo@openerp.com-20131015112348-94c10psv1nm4evs6
2013-10-15 13:23:48 +02:00
Sunil Sharma (OpenERP) 79f9857dde [Merge]:lp:~openerp-dev/openobject-addons/trunk-salesteam-kanban-tpa
bzr revid: sunilsharma.sharma07@gmail.com-20131015112043-pt98cyyghkpnyrn4
2013-10-15 16:50:43 +05:30
Martin Trigaux 98d31e411f [FIX] stock: correctly handle case when we have no child location
bzr revid: mat@openerp.com-20131015112016-vj6yr6kfxfe8go2p
2013-10-15 13:20:16 +02:00
Xavier Morel 705e34b7a7 [MERGE] from trunk
bzr revid: xmo@openerp.com-20131015111106-f6kaa0a5py3ph0xn
2013-10-15 13:11:06 +02:00
Xavier Morel 38682f1fba [FIX] incorrect __exit__ calls in tests
bzr revid: xmo@openerp.com-20131015110814-faz7361z0560xgrm
2013-10-15 13:08:14 +02:00
Turkesh Patel (Open ERP) f7edc31870 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131015105405-c010w1d2ez9lk30y
2013-10-15 16:24:05 +05:30
Sunil Sharma (OpenERP) adbffd1e14 [ADD]:sale_crrm:
Added:sale_crm/tests/__init__.py
sale_crm/tests/test_sale_crm_case.py

bzr revid: sunilsharma.sharma07@gmail.com-20131015103818-ai34ff5rbv86wtgl
2013-10-15 16:08:18 +05:30
Fabien Meghazi b475e002bb [FIX] newest werkzeug.utils.escape() does not automatically __repr__
bzr revid: fme@openerp.com-20131015103028-2intnc38kzrqgrl3
2013-10-15 12:30:28 +02:00
Christophe Matthieu d2108bf33c [FIX] sale: change test because product's demo datas have changed
bzr revid: chm@openerp.com-20131015102133-s78olcy53ypu21c5
2013-10-15 12:21:33 +02:00
Xavier Morel e0493cd6d4 [FIX] handling of single-line files sent for preview
bzr revid: xmo@openerp.com-20131015100313-sdgqx1t43922kgq8
2013-10-15 12:03:13 +02:00
Foram Katharotiya (OpenERP) 71f28bd64e [MERGE] with 7.0
bzr revid: fka@tinyerp.com-20131015095439-38akqserkzseb6ng
2013-10-15 15:24:39 +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
Fabien Meghazi c056f03a82 [FIX] main_objet is now always set in qweb rendering context
If no main_object is provided, the current ir.ui.view will be used

bzr revid: fme@openerp.com-20131015095413-ij6dt2rjo527sgga
2013-10-15 11:54:13 +02:00
Christophe Matthieu c14134140d [FIX] website: snippets banner: add contenteditable
bzr revid: chm@openerp.com-20131015095335-e9uik9ov1ghp22m4
2013-10-15 11:53:35 +02:00
Xavier Morel f2feffe5e2 [FIX] backwards-compatible controller decorator not backwards-compatible at all, replace with @route
bzr revid: xmo@openerp.com-20131015095331-r2xm2198zrwax0c7
2013-10-15 11:53:31 +02:00
Xavier Morel bd6efcfc14 [FIX] removal of session_id from params, may not be only in GET params
bzr revid: xmo@openerp.com-20131015095307-3m1gc71dt3zihm26
2013-10-15 11:53:07 +02:00
Christophe Matthieu 38286d850c [IMP] website: snippets banner: now user can't remove the picture
bzr revid: chm@openerp.com-20131015095058-ci36cqfm06j9e15s
2013-10-15 11:50:58 +02:00
Christophe Matthieu 110d2d1386 [FIX] website_sale: forgotten files
bzr revid: chm@openerp.com-20131015094505-g0n3g48megu96kh0
2013-10-15 11:45:05 +02:00
Xavier Morel 5e9dd279c1 [IMP] sensible implementation of set_request
bzr revid: xmo@openerp.com-20131015094216-sgsfukzndfpu8kss
2013-10-15 11:42:16 +02:00
Christophe Matthieu 5dd919e930 [IMP] website_sale: replace sql search by openerp domain for attributes searching
bzr revid: chm@openerp.com-20131015093350-a4irzeqiwpn55gh4
2013-10-15 11:33:50 +02:00
Xavier Morel 96f30d058f [REM] useless leftover crap
bzr revid: xmo@openerp.com-20131015093114-15a2jsmsbveqxuw4
2013-10-15 11:31:14 +02:00
Christophe Simonis 687161f223 [FIX] web: re-add registry_cr() method on request to be compatible with saas-1 branch
bzr revid: chs@openerp.com-20131015090719-kw3ywyqix5ejcsak
2013-10-15 11:07:19 +02:00
Turkesh Patel (Open ERP) d540c2d1c7 [MRG] merge with parent branch
bzr revid: tpa@tinyerp.com-20131015085717-a70uv0ej1nhuzadw
2013-10-15 14:27:17 +05:30
Christophe Matthieu 5f7cbf6ad5 [FIX] account_anglo_saxon: inherit view of product use field and not xpath.
bzr revid: chm@openerp.com-20131015085537-dv70k245v01crptn
2013-10-15 10:55:37 +02:00
Xavier Morel 7040fb35dd [FIX] double-escaping of section labels in m2o completion
bzr revid: xmo@openerp.com-20131015085523-5s5f587486gaa9zj
2013-10-15 10:55:23 +02:00
Darshan Kalola (OpenERP) 09f40c5c8e [MERGE]with latest trunk
bzr revid: dka@tinyerp.com-20131015084724-0dac65ypf35j0hmu
2013-10-15 14:17:24 +05:30
Christophe Matthieu 03b360e19f [FIX] website_sale: search by facets/attributes and category
bzr revid: chm@openerp.com-20131015083331-gypew1z1sb4m9jzt
2013-10-15 10:33:31 +02:00
Christophe Matthieu f06566baa1 [IMP] website_sale: remove some args in t-keep-query xml attr
bzr revid: chm@openerp.com-20131015083010-sxslddq0l8hk174g
2013-10-15 10:30:10 +02:00
Christophe Matthieu e6a831a1a2 [IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02:00
Paramjit Singh Sahota dd18cff878 [IMP] Added attrs for closing balance in pos.
bzr revid: psa@tinyerp.com-20131015073857-b3izcxgn51q25jd0
2013-10-15 13:08:57 +05:30
Pinakin Nayi (OpenERP) 982bb843ce [MERGE]merge with main branch
bzr revid: pna@tinyerp.com-20131015065406-5u51hu1bn79zyxur
2013-10-15 12:24:06 +05:30
Paramjit Singh Sahota bd7a61b8ff [IMP] Added attrs for closing balance.
bzr revid: psa@tinyerp.com-20131015064247-ibvmy8b8wzqjtklm
2013-10-15 12:12:47 +05:30
Pinakin Nayi (OpenERP) d0c9bd0df2 [IMP]purchase : in search view remove UOM filter which display two times
bzr revid: pna@tinyerp.com-20131015060614-dvu9l8on2or7pc1t
2013-10-15 11:36:14 +05:30
Amit Bhavsar (Open ERP) 001423c4a4 [MERGE]merged with main addons.
bzr revid: amb@tinyerp.com-20131015054851-lt4hjz21hsc6qgx2
2013-10-15 11:18:51 +05:30
Paramjit Singh Sahota 760053f90c [MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-20131015053718-bhxj42wvs6ng3k0t
2013-10-15 11:07:18 +05:30
Launchpad Translations on behalf of openerp 8874046c39 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053740-rinm5yfv4pp3toj2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051750-ss2jdlo4w12420rv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051826-9alld47gks4izhjq
2013-10-15 05:18:26 +00:00
Launchpad Translations on behalf of openerp 5cfe4038f1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015044114-anr45am6g1a3h0gg
2013-10-15 04:41:14 +00:00
Antony Lesuisse c195532185 [FIX] debian deps, recommend antiword and python-gevent
bzr revid: al@openerp.com-20131015015800-68pcdv8fg573gi44
2013-10-15 03:58:00 +02:00
Antony Lesuisse ff9e439733 [FIX] fcntl not needed on windows
bzr revid: al@openerp.com-20131015013700-eo0y09ft0p3w0fwe
2013-10-15 03:37:00 +02:00
Frédéric van der Essen d6ae4209e4 [IMP] point_of_sale: hardware acceleration for scrolling
bzr revid: fva@openerp.com-20131014163414-x3mub8q5ajsqvsdl
2013-10-14 18:34:14 +02:00
ddm 2688f258fb [FIX] Lint errors
bzr revid: ddm@openerp.com-20131014161237-1sqv23gd6w0ok81e
2013-10-14 18:12:37 +02:00
Xavier Morel 7d2938394f [FIX] null >= 0 is true...
bzr revid: xmo@openerp.com-20131014155709-9cg4bzof02bhtyts
2013-10-14 17:57:09 +02:00
ddm 64c1ab7f1c [FIX] Repair tour
bzr revid: ddm@openerp.com-20131014155359-3nrggycvuss0fcvp
2013-10-14 17:53:59 +02:00