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
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
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
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
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
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
60c3b07dee
[MERGE] lp:728092
...
bzr revid: qdp-launchpad@openerp.com-20110324140250-9r9vbuetz68oafii
2011-03-24 15:02:50 +01:00
07f7a97171
[FIX]: product: Fixed problem when there is no item_id
...
bzr revid: rpa@tinyerp.com-20110315085008-wfhbzyq7nqp7epti
2011-03-15 14:20:08 +05:30
95e9d3f009
[FIX]: Passed correct item_id in price_get()
...
lp bug: https://launchpad.net/bugs/733143 fixed
bzr revid: rpa@tinyerp.com-20110314131151-9boylr4mb0dde141
2011-03-14 18:41:51 +05:30
a9752fa0c8
[MERGE] merged fix of bug 727162
...
bzr revid: qdp-launchpad@openerp.com-20110309160532-5elwfovvttom3i7w
2011-03-09 17:05:32 +01:00
0efe8a535e
[REF] product/pricelist.py: small code refactoring
...
bzr revid: qdp-launchpad@openerp.com-20110309145201-srzm1vhmega7sh3f
2011-03-09 15:52:01 +01:00
185de3a01b
[FIX]product:Purchase Order price calculation wrong
...
lp bug: https://launchpad.net/bugs/728092 fixed
bzr revid: ron@tinyerp.com-20110307125008-pan2v3m9w7ea2t1r
2011-03-07 18:20:08 +05:30
17f5a9a259
[FIX] : Product: List Index out of range in product on_change
...
lp bug: https://launchpad.net/bugs/727162 fixed
bzr revid: rha@tinyerp.com-20110302063712-tcudvljpwwumsy1s
2011-03-02 12:07:12 +05:30
2fa50661c7
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2
...
bzr revid: rpa@tinyerp.com-20110217132643-q29xoiy6f7izcl3e
2011-02-17 18:56:43 +05:30
3174bc4af5
[FIX] Product : context transmitted as an argument to the call of price_get()
...
lp bug: https://launchpad.net/bugs/709275 fixed
bzr revid: jvo@tinyerp.com-20110215105546-ae4m6ard0twluyra
2011-02-15 16:25:46 +05:30
013cf332f3
[FIX] Product:Now context is transmitted in price_get function call
...
lp bug: https://launchpad.net/bugs/709275 fixed
bzr revid: aag@tinyerp.co.in-20110208110412-02ypx3gk0i1o2uxx
2011-02-08 16:34:12 +05:30
d40ed41564
[MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
...
bzr revid: rpa@tinyerp.com-20110203130753-bz7xrrif5ez1uh2j
2011-02-03 18:37:53 +05:30
f76e0fc097
[Fix]: product: Pricelist with base price set to 0
...
lp bug: https://launchpad.net/bugs/710521 fixed
bzr revid: rha@tinyerp.com-20110201132750-lvp43mmvs0kxqwif
2011-02-01 18:57:50 +05:30
a1a9308685
[MERGE]: Merged with lp:~openerp-dev/openobject-addons/ron-dev-addons2
...
bzr revid: rpa@tinyerp.com-20110105062012-3inccz5v5zsl28t5
2011-01-05 11:50:12 +05:30
29cf676c65
[IMP]Improvement on code price_multi_get()bug:-693056
...
bzr revid: ron@tinyerp.com-20101231114354-61298bobh43f71uw
2010-12-31 17:13:54 +05:30
b1cdbf993a
[Fix] Fix buildbot warning
...
bzr revid: sbh@tinyerp.com-20101230055759-n79di2mcxo8iba27
2010-12-30 11:27:59 +05:30
4367b52c56
[MERGE] Merge lp:~openerp-dev/openobject-addons/ron-dev-addons
...
bzr revid: sbh@tinyerp.com-20101229112714-nwewmpad0dkwurkf
2010-12-29 16:57:14 +05:30
c0771e8554
[IMP] Improvement in Code of price_multi_get() is comparing pricelist_ids to pricelist_version_ids .BUG :-693056
...
bzr revid: ron@tinyerp.com-20101229102410-8710tfk7y9iowon0
2010-12-29 15:54:10 +05:30
8198dc0d09
[FIX]price_multi_get() is comparing pricelist_ids to pricelist_version_ids
...
lp bug: https://launchpad.net/bugs/693056 fixed
bzr revid: ron@tinyerp.com-20101229072945-kj1st3ga52knpfqa
2010-12-29 12:59:45 +05:30
dc6e8e9b34
[MERGE] merged the numerigraphe branch related to common typo mistake 'childs' instead of children. Thanks for the contribution
...
bzr revid: qdp-launchpad@tinyerp.com-20101228170718-3r55jyvpb6m5h05u
2010-12-28 18:07:18 +01:00
02b60a7382
[FIX] product, purchase: price computation based on supplier tab of product (and uom computation) + added some warnings if user selection is not compliant with these info
...
lp bug: https://launchpad.net/bugs/423124 fixed
bzr revid: qdp-launchpad@tinyerp.com-20101221125638-4hj2b2z01oh4uorx
2010-12-21 13:56:38 +01:00
5a0a79f5d5
[IMP] product: suppliers info and pricelist usability improvements
...
bzr revid: qdp-launchpad@tinyerp.com-20101221112925-6ph8bln9x8stnzyn
2010-12-21 12:29:25 +01:00
d827b2f6ea
[REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
...
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
b1cf433ecc
[MERGE]: Merged with trunk-addons.
...
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
382779126a
[MERGE] merged the dev team2 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101126161359-s02ik0bmz3l8lt9u
2010-11-26 17:13:59 +01:00
3700e08ed6
[REF]: Refactored some lines from previous commit.
...
bzr revid: uco@tinyerp.com-20101123113152-0ue71yg9usp1gklx
2010-11-23 17:01:52 +05:30
6dd290e824
[REF]: Replace the condition 'if not context' with 'if context is None'.
...
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
caff6b9685
[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/sus-dev-addons-product
...
bzr revid: rpa@tinyerp.com-20101123065343-qrr46w6cg2v4tmme
2010-11-23 12:23:43 +05:30
94fb037ba4
Add context in price_get_multi function(line237)in product/pricelist.py
...
lp bug: https://launchpad.net/bugs/637243 fixed
bzr revid: tiny@tiny-desktop-20101122130404-4g6lwsyxvaxougc4
2010-11-22 18:34:04 +05:30
8035df3e11
[IMP]: Added context=None in function argument for rest modules.
...
bzr revid: uco@tinyerp.com-20101122103753-idv9fdaqc28rvugu
2010-11-22 16:07:53 +05:30
12fcd1be2f
[IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
...
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
1edeaa9fd7
[Fix] : Fix wrong helptext for field active
...
bzr revid: sbh@tinyerp.com-20101115131555-xd1jwod6dvomuv9x
2010-11-15 18:45:55 +05:30
54f46060dc
[MERGE]
...
bzr revid: hmo@tinyerp.com-20101028114019-5qkatqamaxhx6k0u
2010-10-28 17:10:19 +05:30
214fddfc4c
[MERGE]
...
bzr revid: hmo@tinyerp.com-20101028113641-vhuqs53ocp930zi5
2010-10-28 17:06:41 +05:30
ae6b790237
[MERGE] upgraded to v6.0.0-RC1
...
bzr revid: ls@numerigraphe.fr-20101025084446-w4pv2twvms9zlyxx
2010-10-25 10:44:46 +02:00
1d78ae166b
[FIX] computation in pricelist
...
bzr revid: fp@tinyerp.com-20101018094306-2of34548d0us4qrw
2010-10-18 11:43:06 +02:00
58d8d88e28
[FIX] Product : Corrected variable names
...
lp bug: https://launchpad.net/bugs/653127 fixed
bzr revid: jvo@tinyerp.com-20101004081803-zvv1050ygse3eb10
2010-10-04 13:48:03 +05:30
47867b8d71
[IMP] point_of_sale: performance improvement in pricelist (price_get)
...
bzr revid: olt@tinyerp.com-20100929095742-yi2ldls09prywt48
2010-09-29 11:57:42 +02:00
2bdd3062d6
[IMP] pricelist: performance improvement: created a 'price_get_multi' method to retrieve prices for several products at once
...
bzr revid: olt@tinyerp.com-20100927142150-4yf58feypg0sxn3r
2010-09-27 16:21:50 +02:00
45a8d54f18
[CLEAN]: removed commented code, fixed proper indentation in dictionary and removed extra spaces at few places
...
bzr revid: rvo@tinyerp.co.in-20100813122005-qj1l1iumkfmocyvk
2010-08-13 17:50:05 +05:30
bf8d2a73c0
[IMP][REF] Sql-injection changes, remove print statement, some space improvement.
...
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
a3dd9f05dc
[FIX] 3 security rules, [IMP] object names for logs
...
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
ceab8bfaf3
[FIX] Product :Uom conversion was made 2 times
...
bzr revid: gpa@tinyerp.com-20100513142135-rxz412g4dy7yqdh5
2010-05-13 19:51:35 +05:30
09a575a05e
[IMP] point_of_sale,product: add the view_init in pos_discount and fix the problem of price
...
bzr revid: sbh@tinyerp.com-20100405131456-rryojlpix96y62d0
2010-04-05 18:44:56 +05:30
744bfb8cc1
[IMP] wording: "children" intead of "childs"
...
lp bug: https://launchpad.net/bugs/327259 fixed
bzr revid: ls@numerigraphe.fr-20100324163724-q1xe1ozomk23k17j
2010-03-24 17:37:24 +01:00
1091830208
[IMP] configurable digits in floats per application
...
bzr revid: fp@tinyerp.com-20100306205219-pg1r78deq76t2jg2
2010-03-06 21:52:19 +01:00
e72c090ed9
[FIX] Product : Added Item_id to find the real price for discounted pricelist
...
bzr revid: jvo@tinyerp.com-20100223120634-dp12324am23uzk0e
2010-02-23 17:36:34 +05:30
284ec3e006
Merged with client
...
bzr revid: hda@tinyerp.com-20100216142723-ul7m7do5fpl3r9av
2010-02-16 19:57:23 +05:30
3fbfcac731
[MRG] Merge the last trunk in order to ease the merge from Tiny
...
bzr revid: joel.grandguillaume@camptocamp.com-20100211145043-w9zwltan97u0obk5
2010-02-11 15:50:43 +01:00
b67c517497
[FIX] product: pricelist: ondelete cascade to avoid errors when deleting pricelists and versions ('null value in column "price_version_id" violates not-null constraint')
...
bzr revid: olt@tinyerp.com-20100204071240-gvxzu0hu1utz7jgy
2010-02-04 08:12:40 +01:00
93bd614c8e
merged to remove sql injection
...
bzr revid: hda@tinyerp.com-20100201082939-fj0u5f0pvlgq7j3k
2010-02-01 13:59:39 +05:30
656b1dd1be
[FIX] Product :Uom conversion was made 2 times
...
lp bug: https://launchpad.net/bugs/513230 fixed
bzr revid: jvo@tinyerp.com-20100127143101-02ef025l4mv8nr85
2010-01-27 20:01:01 +05:30
9478383420
[MRG] Merge last trunk to post again my proposal
...
bzr revid: joel.grandguillaume@camptocamp.com-20100122131132-jdg4hqgcnyyl8qva
2010-01-22 14:11:32 +01:00
57cc12f1e8
[FIX] product: Now pricelist objects price get function will pass context to price_get method of product and compute method of currency object
...
bzr revid: mra@tinyerp.com-20100121064627-kwxkds6q14c17nou
2010-01-21 12:16:27 +05:30
fb3ef7a2f4
[FIX] Change the year of the copyright
...
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
ffd766bd42
[IMP] Change pricelist for price type into company property
...
[IMP] Change all valuation according to price type instead of pricelist
[IMP] Compute the aveerage price based on the define price type in the company, this allow company to have different cost price
bzr revid: joel.grandguillaume@camptocamp.com-20091223152806-cacd3e8loi7tea53
2009-12-23 16:28:06 +01:00
04de6bdc97
[IMP] Added company_id fields to pricelist views
...
bzr revid: fabian@fabian-openerp-20091223141138-7nx2lm292qtagseh
2009-12-23 15:11:38 +01:00
54d968371a
[FIX] Pricelist : Correction in price_get() to achieve proper price.
...
lp bug: https://launchpad.net/bugs/438144 fixed
bzr revid: jvo@tinyerp.com-20091223111443-id4ef38w1j6b9cgg
2009-12-23 16:44:43 +05:30
5a4e8b8092
[IMP]: Generalization of tooltips: Improved tooltips for all fields.
...
bzr revid: uco@tinyerp.co.in-20091222064551-k6g299rk9ly1oyg3
2009-12-22 12:15:51 +05:30
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
10c3b2da7d
[IMP]: Generalization of tooltips: Added tooltips for active field
...
bzr revid: uco@tinyerp.co.in-20091221122132-hkesf2dy48lpdvum
2009-12-21 17:51:32 +05:30
a7be6bfaf6
[IMP]:product module sql queries to parameterized query
...
bzr revid: nch@tinyerp.com-20091124120906-ssum4kpo1g1klw3f
2009-11-24 17:39:06 +05:30
1b0700fd2f
Merged
...
bzr revid: hda@tinyerp.com-20091106111216-hwo5f87jzd5llx7i
2009-11-06 16:42:16 +05:30
80f729db80
[FIX] Product : Pricelist Item cannot use Main pricelist as the other pricelist
...
lp bug: https://launchpad.net/bugs/471052 fixed
bzr revid: jvo@tinyerp.com-20091104095630-cg9y5hrnh95p16z0
2009-11-04 15:26:30 +05:30
eb0b928cc0
Changed licencing terms
...
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30
41e8ed59ef
changed encoding to coding in all py files
...
lp bug: https://launchpad.net/bugs/357182 fixed
bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
2009-10-13 11:28:37 +05:30
777942a9ba
[FIX] Product : Pricelist types getting translated on Pricelist
...
lp bug: https://launchpad.net/bugs/439469 fixed
bzr revid: jvo@tinyerp.com-20091001113220-v5j8aaop9y560yen
2009-10-01 17:02:20 +05:30
2d281b5f63
Merged Trunk to addons/5.0
...
bzr revid: jvo@tinyerp.com-20090409100219-5bo156xq8k24qmru
2009-04-09 15:32:19 +05:30
47d91c7bc1
improvied_priclise_control
...
bzr revid: fp@tinyerp.com-20090315175231-64ww97tuitf3xvnq
2009-03-15 18:52:31 +01:00
f5a71d67d7
improved_pricelist_copy
...
bzr revid: fp@tinyerp.com-20090315170723-fdco0n0taon2lqye
2009-03-15 18:07:23 +01:00
6dce4f1248
[FIX] related are stored
...
bzr revid: fp@tinyerp.com-20091209095238-1rt7nk6fel8n6bzy
2009-12-09 10:52:38 +01:00
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
bad5f0ab56
bugfix
...
lp bug: https://launchpad.net/bugs/338240 fixed
bzr revid: hda@hda-20090309133504-ljtd7nqbex4hvi4c
2009-03-09 19:05:04 +05:30
9049abc55c
Many label changes, one functional (spelling) fix in passing.
...
bzr revid: gsg@pinot-grigio-20090127111546-96d4h0r74pvs43qu
2009-01-27 11:15:46 +00:00
199b2f437d
bugfix
...
bzr revid: fp@tinyerp.com-20090122230436-s75nco22cskwkroo
2009-01-23 00:04:36 +01:00
9eae2d5941
minor changes
...
bzr revid: pso@tinyerp.com-20090106111744-84c8pm09jgydx1ka
2009-01-06 16:47:44 +05:30
21f104a506
[IMP] Update the copyright to 2009
...
bzr revid: stephane@tinyerp.com-20090104221250-55q32ayj2t8kzb2k
2009-01-04 23:12:50 +01:00
d47f1b6650
modifs
...
bzr revid: fp@tinyerp.com-20081229172857-rwpkla4hmala06vh
2008-12-29 18:28:57 +01:00
be6cd6de77
bugfix
...
bzr revid: fp@tinyerp.com-20081229163326-xnro852229r6hqzs
2008-12-29 17:33:26 +01:00
9dac7587aa
[FIX] pricelist: name_get: utf8 it
...
bzr revid: christophe@cobalt-20081229145549-b9gwgmam73yeyg6h
2008-12-29 15:55:49 +01:00
e82cf76be7
Bugfix:name_get on pricelist
...
bzr revid: jvo@tinyerp.com-20081226065018-8249xplpekt34oz1
2008-12-26 12:20:18 +05:30
c245b59174
merge
...
bzr revid: fp@tinyerp.com-20081224155006-uefgofghmofr1r5g
2008-12-24 16:50:06 +01:00
245bdf0433
bugfix_speed_improvement
...
bzr revid: fp@tinyerp.com-20081213060519-t79l5dvxcy98pl33
2008-12-13 07:05:19 +01:00
1a0de2f0f9
[FIX] psycopg2: %d -> %s
...
bzr revid: christophe@tinyerp.com-20081210142955-ewfr1qhzq9l1tjzn
2008-12-10 15:29:55 +01:00
7f9fe360f3
*merge of the ~activity/openobject-addons/trunk branch. Improvement of translatability and small bugfixes
...
*small modifs on mrp_repair module
bzr revid: qdp@tinyerp.com-20081208170840-ryh5435c5heqsngl
2008-12-08 18:08:40 +01:00
f5fad0ba30
passing modules in GPL-3
...
bzr revid: christophe@tinyerp.com-20081103191856-jhcivvwb16fvz2os
2008-11-03 20:18:56 +01:00
172b819812
tooltips
...
bzr revid: fp@tinyerp.com-20080922060656-bl3w7h6uez38ktka
2008-09-22 08:06:56 +02:00
4e634e7668
tooltips
...
bzr revid: fp@tinyerp.com-20080922055630-uqzvzyz8ws260omr
2008-09-22 07:56:30 +02:00
abeddaa388
Small Improvements
...
bzr revid: fp@tinyerp.com-20080826221832-4vi06cwuv1lb238q
2008-08-27 00:18:32 +02:00
4596ba9353
fixed bug on price_get method of pricelist
...
bzr revid: hmo@tinyerp.com-20080730052049-io4zb9ytxmsdi431
2008-07-30 10:50:49 +05:30
3e3d897e88
add encoding comment and vim comment
...
bzr revid: christophe@tinyerp.com-20080723144147-77o5t9adx26a84lt
2008-07-23 16:41:47 +02:00
d2ff95f665
replace tabs with 4 spaces
...
bzr revid: christophe@tinyerp.com-20080722151128-f5zy75tsn8pgtndd
2008-07-22 17:11:28 +02:00
fd885debd5
Better Menus and Views
...
bzr revid: fp@tinyerp.com-6ae3ac1df449bd19db7b0366feb935e8e33d5101
2008-07-08 20:56:25 +00:00
1f43329f0e
* translation of nearly all exceptions
...
* the export of translations per module take only the files of these modules
bzr revid: chs@tinyerp.com-77721e34d87043c4008239f004c7c616f6d4dc82
2008-07-08 08:13:12 +00:00
584a0f0d33
*price_get function of list_price: added the partner into the context
...
bzr revid: qdp-89776de92c8d69ed25acea80ba6ea9558247df74
2008-06-20 11:25:17 +00:00
Olivier Dony
Jay Vora (OpenERP)
Anup (OpenERP)
Rifakat
Quentin (OpenERP)
Rucha (Open ERP)
Rifakat Haradwala (Open ERP)
aag (OpenERP)
Sbh (OpenERP)
uco (OpenERP)
sus
Harry (OpenERP)
Numerigraphe - Lionel Sausin
Fabien Pinckaers
Rvo (Open ERP)
vra
gpa
HDA (OpenERP)
Joël Grand-Guillaume
mra (Open ERP)
Stephane Wirtel
fabian
uco (OpenERP)
husen daudi
Geoff Gardiner
pso (tiny)
Stephane Wirtel
Christophe Simonis
Christophe Simonis
qdp
Christophe Simonis