382779126a
[MERGE] merged the dev team2 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101126161359-s02ik0bmz3l8lt9u
2010-11-26 17:13:59 +01:00
f4ebea2992
[IMP]: Apply removing changes when merge branch
...
bzr revid: ksa@tinyerp.co.in-20101123132434-fm0u05iasfpt0c3p
2010-11-23 18:54:34 +05:30
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
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
f39976fd44
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101119061009-ifb550mjz3ei8hoa
2010-11-19 11:40:09 +05:30
6bf27c6c65
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101119042250-hlgt8xeirm1tc5p6
2010-11-19 09:52:50 +05:30
c90aa7f2f0
[FIX] caldav,email_template,hr_payroll,mrp: cleanup some calls to _( ) - only literal strings should ever been passed!
...
bzr revid: odo@openerp.com-20101118162131-s2nb25l3e4xzmnjg
2010-11-18 17:21:31 +01:00
4c517bc53a
[REM]:lp-500931 remove wrong changes
...
bzr revid: ksa@tinyerp.co.in-20101118045531-eihmkjo3a4rv8mj5
2010-11-18 10:25:31 +05:30
01c15d9cce
[FIX]:lp-500931 No analytic entry is generated finishing one production order
...
bzr revid: ksa@tinyerp.co.in-20101116094738-4re2jphx8t0emwcc
2010-11-16 15:17:38 +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
abf8d940f3
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101028051032-whk92x9v2223xd7h
2010-10-28 10:40:32 +05:30
77acdd2a10
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101027124019-gaawsihhqt71ppk1
2010-10-27 18:10:19 +05:30
cbc52ce458
[MERGE] merged from openobject-addons branch
...
bzr revid: hmo@tinyerp.com-20101027053819-if1wltlbyizl4n5r
2010-10-27 11:08:19 +05:30
b20cb29711
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101022045229-5ducia4beqzc0xfk
bzr revid: ksa@tinyerp.co.in-20101025050348-ugnwahrtey52h6hh
bzr revid: ksa@tinyerp.co.in-20101026050519-r9ajvgj8tn7el9yx
2010-10-26 10:35:19 +05:30
36dd47081b
[FIX] mrp : Corrections for Work Order names
...
bzr revid: jma@tinyerp.com-20101021124632-vfv5jesa55mzkxz7
2010-10-21 18:16:32 +05:30
988d4d488b
[IMP] mrp, stock: Improvements suggested by buildbot.
...
bzr revid: uco@tinyerp.com-20101020135735-hofrhxqqpvkycjje
2010-10-20 19:27:35 +05:30
9475077629
[FIX] mrp: many2many and one2many field support domain. so removed many2many_domain,one2many_dommain in mrp.py
...
lp bug: https://launchpad.net/bugs/663003 fixed
bzr revid: hmo@tinyerp.com-20101020130212-j1373iyv4e6ysftg
2010-10-20 18:32:12 +05:30
29b353d5d2
[FIX] mrp: regression: production orders moves are wrongly done from 'Stock' to 'Stock'
...
lp bug: https://launchpad.net/bugs/622948 fixed
bzr revid: hmo@tinyerp.com-20101020105816-08af1r7unnxcagv0
2010-10-20 16:28:16 +05:30
a2326e2f95
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101020045725-3ozsb1aw379acz63
2010-10-20 10:27:25 +05:30
1645a3beee
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101019050710-7mxbjxxv020kdqoc
2010-10-19 10:37:10 +05:30
8144076ced
[MERGE] merged the team 1 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101018122342-9rbds2y7qprzp7dr
2010-10-18 14:23:42 +02:00
f8eb6b0184
[MERGE]
...
bzr revid: uco@tinyerp.com-20101018074341-zh2lchjja6kzwnco
2010-10-18 13:13:41 +05:30
6430fec108
[IMP] logs
...
bzr revid: fp@tinyerp.com-20101016140241-dldu351awva0eht0
2010-10-16 16:02:41 +02:00
201b94bd38
[IMP] mrp: usability improvements
...
bzr revid: qdp-launchpad@tinyerp.com-20101015165859-3k9mc0e1zow8sioo
2010-10-15 18:58:59 +02:00
ac86ce08a0
[IMP] mrp: usability improvements
...
bzr revid: qdp-launchpad@tinyerp.com-20101015124305-23d3qp5oonwqmx41
2010-10-15 14:43:05 +02:00
dd69d75e4b
[IMP] mrp: Added company field on Routing and Workcenter. Improved search views.
...
bzr revid: uco@tinyerp.com-20101015122455-xaxwkf4f3d3al7tt
2010-10-15 17:54:55 +05:30
1b24dc5b41
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101013050133-br53nhnn0n2tafk0
2010-10-13 10:31:33 +05:30
788881af5d
[MERGE:IMP] merge addons-stock branch with latest improvement to Warehouse Management
...
bzr revid: odo@openerp.com-20101011175802-n705sldw70bp4xpx
2010-10-11 19:58:02 +02:00
73254f138b
[MERGE]: Merged with lp:~openerp-community/openobject-addons/addons-fix-finnished.
...
bzr revid: uco@tinyerp.com-20101007073124-hjgz0ot80zc9e4g3
2010-10-07 13:01:24 +05:30
fe7e284a31
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100928045605-8ah6996a6k447sjp
2010-09-28 10:26:05 +05:30
9c721764ff
[MERGE]: Merged with trunk-addons.
...
bzr revid: uco@tinyerp.com-20100927090110-9tk3ofemowc7wdqs
2010-09-27 14:31:10 +05:30
fa9a98c692
[FIX] mrp: Corrected error on saving production order record.
...
bzr revid: uco@tinyerp.com-20100924053535-qnt5or0p9lpg1h15
2010-09-24 11:05:35 +05:30
cf4ea3b57a
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20100923061103-8fm2ek7u9nug3wph
2010-09-23 11:41:03 +05:30
f9bde89534
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100923044808-megfolc3kghw1e6i
2010-09-23 10:18:08 +05:30
6d1dedeee9
[FIX] hr_timesheet_sheet, mrp: don't pass a dict or list to fromkeys second argument (it's only evaluated once)
...
bzr revid: olt@tinyerp.com-20100922083838-80ikcizior7qkcic
2010-09-22 10:38:38 +02:00
15197e129c
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100922050131-u4fduka8kjlcwn5a
2010-09-22 10:31:31 +05:30
d82c2c5e0f
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20100922045607-iv2x2ze4g50lwi0p
2010-09-22 10:26:07 +05:30
737db203a6
[FIX] MRP : import statement fix
...
bzr revid: jvo@tinyerp.com-20100921120442-cqgi121lgzkqsmoi
2010-09-21 17:34:42 +05:30
5c94f9e27f
[IMP] mrp: only import the methods actually used instead of whole module
...
bzr revid: olt@tinyerp.com-20100920151156-cz77f9le62a3xo8n
2010-09-20 17:11:56 +02:00
f3dd4e659d
[IMP] sale,mrp,purchase: Rename the date_planned to date in stock_move
...
bzr revid: sbh@tinyerp.com-20100921123453-186dl4tyq1mwzo2x
2010-09-21 18:04:53 +05:30
f691dc9f77
[IMP] mrp: performance improvement: avoid select sql inside loops
...
bzr revid: olt@tinyerp.com-20100920111110-c7bw90kns2bo6jpo
2010-09-20 13:11:10 +02:00
b9d743fc68
[IMP] mrp: performance improvment: avoid select sql inside loops
...
bzr revid: olt@tinyerp.com-20100920101025-30zwlatr9qs2akso
2010-09-20 12:10:25 +02:00
5fd0497457
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100920055940-cikw8ea3ntyxy6r1
2010-09-20 11:29:40 +05:30
49b9ae8e2e
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100917103906-zick9zmfc7ul06pz
2010-09-17 16:09:06 +05:30
dd2b1bed63
[FIX] Removed all code and XML mentions of "finnished", as it's written "finished" (Bug #326160 )
...
bzr revid: niels@bubbles-it.be-20100915115812-j6lec74or0y61psp
2010-09-15 13:58:12 +02:00
b2f4dce58f
[IMP] mrp, mrp_xxx: Form and List views improved according to Checklist guidelines.
...
bzr revid: uco@tinyerp.com-20100914124506-y0ls43epnm2uutxr
2010-09-14 18:15:06 +05:30
3575decfab
[IMP]: Removed unused variables and import statements. Removed '\r' escape sequences from translation files.
...
bzr revid: uco@tinyerp.com-20100908122515-d37yvyxb2a1119oy
2010-09-08 17:55:15 +05:30
6ac408938f
[MERGE]
...
bzr revid: uco@tinyerp.com-20100908043024-082xdeyai0ujmqpv
2010-09-08 10:00:24 +05:30
386aee4aeb
[FIX] mrp: On the Production Order tree view 'Group By' doesn't make the sum for 'Total Hours' and 'Total Cycle' columns.
...
bzr revid: uco@tinyerp.com-20100907055658-y1m9caut175bndbz
2010-09-07 11:26:58 +05:30
e7e2b3afd4
[MERGE] Merge with lp:openeobject-addons
...
bzr revid: sbh@tinyerp.com-20100907053419-7cepgjlcpa55nv1s
2010-09-07 11:04:19 +05:30
0cd651e421
[IMP] mrp: Production Lot field should not be readonly. Improved alignment.
...
bzr revid: uco@tinyerp.com-20100903112447-ns238b37z3om6ryk
2010-09-03 16:54:47 +05:30
5d2dae07b8
[IMP] stock:Rename scraped field to scrapped
...
bzr revid: sbh@tinyerp.com-20100831065427-3hpd7kbvs34k0rf4
2010-08-31 12:24:27 +05:30
2eaf0ee8a4
[FIX] mrp: Fixed problem of wrong calculation of Consumed Products in a Production Order.
...
bzr revid: uco@tinyerp.com-20100819073252-a8djnr7vdue2m3db
2010-08-19 13:02:52 +05:30
ed29832f40
[IMP] all addons with _inherits: ensure the m2o to the parent is required with ondelete=cascade
...
The framework has been updated to fix this automatically, but having it set correctly in the _columns is better for readability, and avoids the warnings.
bzr revid: odo@openerp.com-20100812192933-nm46mik1hkzsme2q
2010-08-12 21:29:33 +02:00
0e66de1a9f
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100720055445-iojkpg3rb5smadhs
2010-07-20 11:24:45 +05:30
09f5953295
[REF] mrp: Cleaning the module.
...
bzr revid: uco@tinyerp.com-20100805102052-waegbh1uyfrhid76
2010-08-05 15:50:52 +05:30
48bf89dc34
[MERGE] a few project management-related minor fixes
...
bzr revid: odo@openerp.com-20100730122712-vn8biovwd8w1bull
2010-07-30 14:27:12 +02:00
d4819f7d32
[MERGE]
...
bzr revid: hmo@tinyerp.com-20100729081847-45lbkd3nyxnousrr
2010-07-29 13:48:47 +05:30
464df17d32
[MERGE]
...
bzr revid: uco@tinyerp.com-20100729044258-t7l7ociqgcj1ejoy
2010-07-29 10:12:58 +05:30
50bcc5f7f1
[REF] minor improvements
...
bzr revid: jvo@tinyerp.com-20100728101125-lpp059efz7glmnef
2010-07-28 15:41:25 +05:30
4f07bca4b4
[MERGE]
...
bzr revid: uco@tinyerp.com-20100726123213-w5wkekz8cir5sow9
2010-07-26 18:02:13 +05:30
f2ded42800
[FIX]: mrp: Fix log message for production order
...
bzr revid: rpa@tinyerp.com-20100726104553-vme18hbsvfds3i1n
2010-07-26 16:15:53 +05:30
4a6e930967
[MERGE]
...
bzr revid: uco@tinyerp.com-20100726045014-visykrnftlghnjmb
2010-07-26 10:20:14 +05:30
75308e6eb9
[merge]
...
bzr revid: rvalyi@gmail.com-20100725155920-v60xeb515bgxpm1m
2010-07-25 12:59:20 -03:00
f429080dc5
[IMP] mrp: reset default product rounding with 0 in bom
...
bzr revid: hmo@tinyerp.com-20100724113124-d0afp96njz71pbc2
2010-07-24 17:01:24 +05:30
6be5f7cb28
[IMP] mrp: improce view of bom, workcenter
...
bzr revid: hmo@tinyerp.com-20100724091658-evcyhq7zly4rhpoy
2010-07-24 14:46:58 +05:30
1c365d37ce
[merge]
...
bzr revid: rvalyi@gmail.com-20100723145429-utly4nv20yj1ll45
2010-07-23 11:54:29 -03:00
e9db4d2e59
[Fix] mrp: fix the log message
...
bzr revid: sbh@tinyerp.com-20100723141709-9s1ry7xlrdo57d6j
2010-07-23 19:47:09 +05:30
6c896b9767
[IMP]: mrp: Improved log messages
...
bzr revid: rpa@tinyerp.com-20100723134217-q9hnz0bxg191kjca
2010-07-23 19:12:17 +05:30
3b6ba554a3
[IMP] product, mrp:
...
added new function field 'seller_id' to get main supplier who has highet priority in Supplier Information also 'seller_qty'.
added new function 'price_get' in 'product.supplierinfo' model to get price from supplier pricelist.
improved and clean product cost structure report in product form.
bzr revid: hmo@tinyerp.com-20100723131730-hx8nw4tkotmfj4ov
2010-07-23 18:47:30 +05:30
25d237fde6
[merge]
...
bzr revid: rvalyi@gmail.com-20100721134139-tldexkun749xg5ki
bzr revid: rvalyi@gmail.com-20100721184155-pjpgaj333oqoxapq
2010-07-21 15:41:55 -03:00
706a550b86
[REM] MRP : Removed unused field and relevant function
...
bzr revid: jvo@tinyerp.com-20100721084227-7cychhuor3azdpif
2010-07-21 14:12:27 +05:30
5249b531cd
[IMP] mrp, mrp_operations: Improved code and removed unnecessary statements.
...
bzr revid: uco@tinyerp.com-20100715103213-m0bhsv98dhm0ap6r
2010-07-15 16:02:13 +05:30
424cbecb02
[merge]
...
bzr revid: rvalyi@gmail.com-20100708221140-qm59fabmpi8bjzim
2010-07-08 19:11:40 -03:00
34949277ae
[merge]
...
bzr revid: rvalyi@gmail.com-20100708125124-smsittcu9ewpnu90
2010-07-08 09:51:24 -03:00
9ada619c37
[IMP] set logger messages
...
bzr revid: hmo@tinyerp.com-20100708101424-hgbmoqco3to16jer
2010-07-08 15:44:24 +05:30
5ce40c34eb
[Fix] Move the field in procurement
...
bzr revid: sbh@tinyerp.com-20100707114516-cgauhh9srch1i46e
2010-07-07 17:15:16 +05:30
88f8ef366a
[IMP] procurement: Move the mrp.property into mrp
...
bzr revid: sbh@tinyerp.com-20100707091851-cf0zbq0rr8ce4qgu
2010-07-07 14:48:51 +05:30
a0f5e49659
[merge]
...
bzr revid: rvalyi@gmail.com-20100702164355-dg61zmz0e8gsd5h4
2010-07-02 13:43:55 -03:00
e1255aab6f
[IMP] mrp: by default MRP work-centers are supposed to be 'material' resources
...
bzr revid: rvalyi@gmail.com-20100630201308-vf1uu5iyzq4qq6n4
2010-06-30 17:13:08 -03:00
887a3d0532
[REF]
...
bzr revid: jvo@tinyerp.com-20100630184804-ak0s2cka7yofcw84
2010-07-01 00:18:04 +05:30
f2eda8aca1
[MERGE] Merged Chris Halls' branch for copy() of production order
...
bzr revid: jvo@tinyerp.com-20100630184340-j6r3usia3ooazqga
2010-07-01 00:13:40 +05:30
62a8a4ac5b
mrp_repair:
...
* [ADD] YML
* [IMP] useability
mrp:
* [IMP] Add contrains in mrp.production model to check Order quantity could not be negative or zero.
* [IMP] Improve log message on ready production order
* [IMP] useability in Work center, route and BOM
* [FIX+IMP] change Cost price Wizard
* [FIX] yml problem in mrp_phantom and mrp_procurement
* [FIX] produce wiazrd
stock:
* [FIX] Change Cost price wizard
* [IMP] Add property_stock_variation in product category view
mrp_operations, procurement, resource
bzr revid: hmo@tinyerp.com-20100701134010-z3sdg19w0cj49joc
2010-07-01 19:10:10 +05:30
9a686357a9
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100629053051-tbmlaes9vivky5xn
2010-06-29 11:00:51 +05:30
69c9375d7f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100622055952-d25l23t4yk0w5eoa
bzr revid: rpa@tinyerp.com-20100623050403-1jjf3b1x0ebmfaxp
2010-06-23 10:34:03 +05:30
805fb21c22
merge
...
bzr revid: fp@tinyerp.com-20100621185808-ffoiamidk7szdwqg
2010-06-21 20:58:08 +02:00
9c3da9c251
[FIX] sale,purchase,stock
...
bzr revid: fp@tinyerp.com-20100621184058-try3rw3m59uc4e55
2010-06-21 20:40:58 +02:00
9fd9c45e0b
[MERGE]
...
bzr revid: hmo@tinyerp.com-20100618145602-hitjarz5yr5sbi6c
2010-06-18 20:26:02 +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
3fcdccbeca
[MERGE] Merge the changes from main trunk branch.
...
bzr revid: jma@tinyerp.com-20100616114211-baomq9ypqtpbv3ck
2010-06-16 17:12:11 +05:30
1600697615
[MERGE]
...
bzr revid: hmo@tinyerp.com-20100614125230-sy9abxq7c0pfw5xm
2010-06-14 18:22:30 +05:30
291f6cc29b
[MERGE] Merge the changes from main trunk branch.
...
bzr revid: jma@tinyerp.com-20100614104704-tg3nf2v0v167m78z
2010-06-14 16:17:04 +05:30
540d03afb8
merge
...
bzr revid: fp@tinyerp.com-20100614102826-j6k1dwsbi0f1w6ep
2010-06-14 12:28:26 +02:00
cff5d130d1
merge
...
bzr revid: fp@tinyerp.com-20100623152451-v1ibzl70zr5my8iv
2010-06-23 17:24:51 +02:00
3809beae97
[ADD] Task 841: (Backlog: 585): Demo data for crm.lead and crm.opportunity.
...
Task 868: (Backlog: 641): Test manufacturing orders with negative values. (disassembly of products)
bzr revid: uco@tinyerp.com-20100611053431-4pluwz0evur9opyl
2010-06-11 11:04:31 +05:30
684276987a
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100611050904-56ngrdgi4bq8pn8v
2010-06-11 10:39:04 +05:30
4cf1362e3b
[FIX] Security fixes for sql injections
...
bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
2010-06-10 19:04:19 +05:30
b14d68ebc4
[FIX] mrp: multibom useability
...
bzr revid: qdp@cyan-20100603124355-l24jnmyzsvoppaoz
2010-06-03 14:43:55 +02:00
51dbc8c418
[IMP] Task-849 Improvement log Message for account and mrp
...
bzr revid: ksa@tinyerp.co.in-20100603115642-p6dqe7d57a1adekm
2010-06-03 17:26:42 +05:30
qdp-launchpad@tinyerp.com
ksa (Open ERP)
uco (OpenERP)
rpa (Open ERP)
sbh (Open ERP)
Olivier Dony
Harry (OpenERP)
JMA (OpenERP)
Fabien Pinckaers
Niels Huylebroeck
Jay (Open ERP)
Raphaël Valyi
vra
Quentin De Paoli