Commit Graph

243 Commits

Author SHA1 Message Date
Stephane Wirtel 5156002377 [MERGE]
bzr revid: stephane@openerp.com-20100216172931-0fotsao9ezbn9w1k
2010-02-16 18:29:31 +01:00
Stephane Wirtel 972cd3033e [FIX] crm, hr, mrp, sale: Improve some forms
bzr revid: stephane@openerp.com-20100216172139-qehy5r4h1d7g9eev
2010-02-16 18:21:39 +01:00
HDA (OpenERP) 284ec3e006 Merged with client
bzr revid: hda@tinyerp.com-20100216142723-ul7m7do5fpl3r9av
2010-02-16 19:57:23 +05:30
mra (Open ERP) 12681f33f1 [IMP] English improvement for modules (changes in strings)
bzr revid: mra@tinyerp.com-20100209083146-df5gq5elxem9fh6w
2010-02-09 14:01:46 +05:30
Jay (Open ERP) d81dcdc8cf [FIX] Sale : SOL's subtotal was missign price-accuracy
lp bug: https://launchpad.net/bugs/459027 fixed

bzr revid: jvo@tinyerp.com-20100208131447-je1th6tb1ql1mau3
2010-02-08 18:44:47 +05:30
VRA(OpenERP) 3c9f4f2fac [FIX] Sale/Purchase : Worfklow instance had to ve removed while setting record's workflow back to draft state
lp bug: https://launchpad.net/bugs/401801 fixed

bzr revid: jvo@tinyerp.com-20100205113525-5l4pb805w19s6c9q
2010-02-05 17:05:25 +05:30
olt@tinyerp.com 47c3b5519a [FIX] sale: onchange on partner_id now set the partner's dedicated salesman as the sale salesman or the user if there is no dedicated salesman on that partner
bzr revid: olt@tinyerp.com-20100205085630-pn0smp1ras32gmf9
2010-02-05 09:56:30 +01:00
olt@tinyerp.com 7f1589769b [FIX] sale: onchange on partner_id now set the partner's dedicated salesman as the sale salesman
bzr revid: olt@tinyerp.com-20100203114314-p48a6joztsu86r3y
2010-02-03 12:43:14 +01:00
GPA(OpenERP) 0c14c9360c [FIX] Sale : Order lines should be not editable for non-draft SO.
lp bug: https://launchpad.net/bugs/513983 fixed

bzr revid: jvo@tinyerp.com-20100202094523-2a6l3i4o2q9147bt
2010-02-02 15:15:23 +05:30
HDA (OpenERP) 93bd614c8e merged to remove sql injection
bzr revid: hda@tinyerp.com-20100201082939-fj0u5f0pvlgq7j3k
2010-02-01 13:59:39 +05:30
HDA (OpenERP) 0b2bb31992 Merge from stable
bzr revid: hda@tinyerp.com-20100121151350-58pcefq2tdw2ge2l
2010-01-21 20:43:50 +05:30
Christophe Simonis 74b7f573ea [MERGE]
bzr revid: chs@tinyerp.com-20100112160341-uloolawazbybx01w
2010-01-12 17:03:41 +01:00
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
Xavier Morel f51eaab7ea [merge] from trunk
bzr revid: xmo@tinyerp.com-20100112083009-gn2zawih1y6hbpsr
2010-01-12 09:30:09 +01:00
Jay (Open ERP) a23b83db01 [FIX] Functional fields should have context as an argument when we use fnct_searc method
lp bug: https://launchpad.net/bugs/504670 fixed

bzr revid: jvo@tinyerp.com-20100108113858-dp3e8pm5px4uspum
2010-01-08 17:08:58 +05:30
Jay (Open ERP) 45407b1e1f [IMP] Invoice/Sale/Purchase : Made note fields translatable(they may be used for partner reports)
bzr revid: jvo@tinyerp.com-20100108072721-vr4s051bqx7bwlmq
2010-01-08 12:57:21 +05:30
Xavier Morel 829bce5ea9 [merge] from trunk
bzr revid: xmo@tinyerp.com-20091230132501-eioxs2a7fdpj2j6m
2009-12-30 14:25:01 +01:00
Xavier Morel 5855e5861a [merge] from trunk
bzr revid: xmo@tinyerp.com-20091230132128-d7pgvcu933ip41je
2009-12-30 14:21:28 +01:00
Harry (Open ERP) 625e67df3b [MERGE] merge from lp:~openerp-commiter/openobject-addons/ergonomy-search-views
bzr revid: hmo@tinyerp.com-20091230123242-a4bvd12vbd6afwds
2009-12-30 18:02:42 +05:30
Vir (Open ERP) 704c383190 [ADD] Help added on state field for sale.order.line object
bzr revid: vir@tinyerp.com-20091230055601-ewt74wxjjop8v3ig
2009-12-30 11:26:01 +05:30
Fabien Pinckaers c032072ca1 merge
bzr revid: fp@tinyerp.com-20091223171752-zunj0g08eknomv0l
2009-12-23 18:17:52 +01:00
Fabien Pinckaers cbd41d602b [FIX] multi company_default
bzr revid: fp@tinyerp.com-20091223171639-hgvyetizdgyh0itv
2009-12-23 18:16:39 +01:00
Harry (Open ERP) 509873ea1a [MERGE] merge from lp:~openerp-commiter/openobject-addons/ergonomy-search-views regrading tooltips improvement
bzr revid: hmo@tinyerp.com-20091223065634-b0q08mtx0dwg50le
2009-12-23 12:26:34 +05:30
Fabien Pinckaers 320e418660 [FIX] added store=True on sale.order
bzr revid: fp@tinyerp.com-20091222205633-xzthswfavntuphky
2009-12-22 21:56:33 +01:00
Fabien Pinckaers 3cc2c44407 [IMP] multi-company fields
bzr revid: fp@tinyerp.com-20091222190737-gyye9ubuk5vrq8dj
2009-12-22 20:07:37 +01:00
uco (OpenERP) c1d66e1ac5 [IMP]: Generalization of tooltips: Added tooltips for 'origin' fields, renamed 'Ref' to 'Reference', Added same tooltips for same fields of 'account & account template' and 'tax & tax templates'
bzr revid: uco@tinyerp.co.in-20091222093841-2uamhp6w0wkmcnk0
2009-12-22 15:08:41 +05:30
uco (OpenERP) 8d3fb81f4e [IMP]: Generalization of tooltips: Added tooltips for sequence field
bzr revid: uco@tinyerp.co.in-20091221131412-xv3u9m8556xkyg6t
2009-12-21 18:44:12 +05:30
uco (OpenERP) c9f66f69f0 [IMP]: Tooltip improvements: Typo errors and improvements
bzr revid: uco@tinyerp.co.in-20091221095054-do0gbj9907u3oyxc
2009-12-21 15:20:54 +05:30
GPA(OpenERP) 792725fac9 [FIX] Sale : SO was getting stuck when invoice is cancelled and SOL is with product.
lp bug: https://launchpad.net/bugs/490965 fixed

bzr revid: jvo@tinyerp.com-20091216062610-6y3fkslez7monb8n
2009-12-16 11:56:10 +05:30
Xavier Morel 3bbf579f49 [fix] sale: migrate to res.config-based initial configuration
bzr revid: xmo@tinyerp.com-20091215155552-3jst1v1qsuqqfrzn
2009-12-15 16:55:52 +01:00
Fabien Pinckaers 6dce4f1248 [FIX] related are stored
bzr revid: fp@tinyerp.com-20091209095238-1rt7nk6fel8n6bzy
2009-12-09 10:52:38 +01:00
Fabien Pinckaers 2cc7f42c5a [FIX] removed print statement
bzr revid: fp@tinyerp.com-20091203220524-2p3k0rbd2vgyvzco
2009-12-03 23:05:24 +01:00
Fabien Pinckaers 457b377f89 [FIX] picked in SO
bzr revid: fp@tinyerp.com-20091203205321-ujfh08p383ezb7m4
2009-12-03 21:53:21 +01:00
Fabien Pinckaers 9403f6011f merge
bzr revid: fp@tinyerp.com-20091203173535-1qjxtllbno40dpjq
2009-12-03 18:35:35 +01:00
Fabien Pinckaers 198bc60289 [FIX] Regression in SO from Jeroen and Jay, picked state see bug #491375
bzr revid: fp@tinyerp.com-20091203173113-a6j7av8brwf36ao9
2009-12-03 18:31:13 +01:00
fabian 1578c2858d [FIX] Added journal control per company for sale and purchase invoice creation
[ADD] Added company_id in pricelist
[FIX] Removed duplicated company_id fields from stock

bzr revid: fabian@fabian-openerp-20091202112006-ztnje8qdrgkg7nvl
2009-12-02 12:20:06 +01:00
Harry (Open ERP) ec0abc8968 [MERGE] merge from lp:~openerp/openobject-addons/5.0/
bzr revid: hmo@tinyerp.com-20091202085041-v3ae7tu3krbr2heh
2009-12-02 14:20:41 +05:30
fabian 9cc171f3ef [REM] Removed company wise prices in product (it should use pricelist instead)
[ADD] Added company_id fields in multiple models
[ADD] Added multicompany management for invoice, sale, mrp and stock (it now passes the company_id from ressource to ressource)
[FIX] Fixed default company method
[ADD] Added multicompany rules to demo datas

bzr revid: fabian@fabian-openerp-20091201145418-upu1kghhvrk4yuzy
2009-12-01 15:54:18 +01:00
olt@tinyerp.com 8c349adead [FIX] account, invoice, sale: description (product sold, invoice line and account entry line) was not translated
lp bug: https://launchpad.net/bugs/489355 fixed

bzr revid: olt@tinyerp.com-20091130160220-t0nroni5p0ufy5wi
2009-11-30 17:02:20 +01:00
Harry (Open ERP) 148d079485 [MERGE] merge from lp:~hmo-tinyerp/openobject-addons/p_christeas_addons/
bzr revid: hmo@tinyerp.com-20091130112301-mba4ea9byoyb5cbz
2009-11-30 16:53:01 +05:30
nch@tinyerp.com 59ea96657a [MERGE]
bzr revid: nch@tinyerp.com-20091130103346-3dytu4ds9gzta53c
2009-11-30 16:03:46 +05:30
Jay (Open ERP) bed149310f [FIX] Sale : State was written wrongly
lp bug: https://launchpad.net/bugs/488809 fixed

bzr revid: jvo@tinyerp.com-20091130074622-m3p60lsti3dn3shv
2009-11-30 13:16:22 +05:30
GPA(OpenERP),VRA(OpenERP) d549927afc [MERGE] Merged Multicompany branch
bzr revid: jvo@tinyerp.com-20091130062207-7yxysaq03yypk2be
2009-11-30 11:52:07 +05:30
Harry (Open ERP) 4d6d553d17 [MERGE] merge from lp:~openerp/openobject-addons/5.0/
bzr revid: hmo@tinyerp.com-20091128110526-yen7frgcg9nkbn7h
2009-11-28 16:35:26 +05:30
Fabien Pinckaers 7ea99724a7 [imp] multi-company + merge
bzr revid: fp@tinyerp.com-20091128092522-g7fumj3p55kv6ygr
2009-11-28 10:25:22 +01:00
nch@tinyerp.com 7d1b6aadb5 [MERGE]
bzr revid: nch@tinyerp.com-20091127084026-qmju10co18vkywrd
2009-11-27 14:10:26 +05:30
Panos Christeas 8d0b4a7418 [MERGE] merge from lp:~xrg/openobject-addons/doc2-5.2
bzr revid: hmo@tinyerp.com-20091126135400-z32iycvadbt9so8n
2009-11-26 19:24:00 +05:30
kum (Open ERP) c9f87c4dc9 [IMP] English Improvement resolved conflicts
bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f
2009-11-26 14:12:52 +05:30
kum (Open ERP) 38caea46b0 [IMP] English Improvement
bzr revid: kum@tinyerp.co.in-20091125093144-4pburrqn0rhq6y39
2009-11-25 15:01:44 +05:30
rpa (Open ERP) c86680370d [Merge]: Merge with same branch
bzr revid: rpa@tinyerp.com-20091125071039-pttk0tadnftcgrlm
2009-11-25 12:40:39 +05:30