e672d533bf
[MERGE] Merged trunk-trigger-on_write_completed.
...
bzr revid: vta@openerp.com-20121008123521-ob50thw2hej4zlkk
2012-10-08 14:35:21 +02:00
Twinkle Christian (OpenERP)
74e6eb665d
[MERGE]Merge with lp:openobject-addons
...
bzr revid: tch@tinyerp.com-20121005115819-8fi7h7l24cz2iz38
bzr revid: tch@tinyerp.com-20121008123455-94wsdpfjuyabwbm4
2012-10-08 18:04:55 +05:30
2b19de7169
[MERGE] Merged trunk-trigger-on_write_completed.
...
bzr revid: vta@openerp.com-20121008123444-alj156bzuz1rnep6
2012-10-08 14:34:44 +02:00
Frédéric van der Essen
0acff4fbbb
[FIX] css: fixed spacing around form header buttons
...
bzr revid: fva@openerp.com-20121008122721-uide1ggwqsfr8eks
2012-10-08 14:27:21 +02:00
niv-openerp
06fd81019c
[IMP] minor modif in view form
...
bzr revid: nicolas.vanhoren@openerp.com-20121008122552-822exc15j1onv6v6
2012-10-08 14:25:52 +02:00
Randhir Mayatra (OpenERP)
8eb2ab20a2
[IMP]improve the code
...
bzr revid: rma@tinyerp.com-20121008122102-gmrl5mfs5dcjd4k6
2012-10-08 17:51:02 +05:30
Quentin (OpenERP)
5b6ae3b88e
[FIX] sale, account: propagate the sequence from the sale order line to the invoice line
...
bzr revid: qdp-launchpad@openerp.com-20121008121745-2s1cavfy891hbf7s
2012-10-08 14:17:45 +02:00
Raphael Collet
659eaa6d15
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20121008121655-swybuxw5mhl9zfe6
2012-10-08 14:16:55 +02:00
Xavier Morel
7bcbadb099
[FIX] update py.js to 0.6, port existin classes to it, attempt to implement timedelta
...
bzr revid: xmo@openerp.com-20121008120619-lhmexjnujjrigjn9
2012-10-08 14:06:19 +02:00
1f062c54ab
[FIX] Remove add_last for on_write_completed.
...
bzr revid: vta@openerp.com-20121008120427-1cxemqo6onwc91up
2012-10-08 14:04:27 +02:00
Olivier Dony
43595fbeb1
[FIX] mail: default email From should consider user email if there is no alias
...
bzr revid: odo@openerp.com-20121008120421-k9aj7g6vsr3zu5u2
2012-10-08 14:04:21 +02:00
Olivier Dony
bc3009d590
[FIX] mail: default alias_domain should be web.base.url
...
bzr revid: odo@openerp.com-20121008120351-fqmjckrjmy52xdji
2012-10-08 14:03:51 +02:00
Chris Biersbach
ac935d6580
[FIX] Missing brackets in .rml files
...
bzr revid: cbi@openerp.com-20121008115950-n54c52tugw8sisys
2012-10-08 13:59:50 +02:00
e00dcf2eb8
[FIX] Fixed spacing.
...
bzr revid: vta@openerp.com-20121008114026-zpvwsl3c54anh512
2012-10-08 13:40:26 +02:00
niv-openerp
b0f007f562
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20121008113751-19je6glthgvb83w8
2012-10-08 13:37:51 +02:00
Atul Patel (OpenERP)
8944588931
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121004050405-de1o2nl772ow12yf
bzr revid: atp@tinyerp.com-20121008051226-6fz3lau22ylb02oc
bzr revid: atp@tinyerp.com-20121008113735-ubbudyuqotrsg5fo
2012-10-08 17:07:35 +05:30
pankita shah (Open ERP)
f047f4709f
[MERGE] merged with lp:openobject-addons
...
bzr revid: shp@tinyerp.com-20121008052627-pvz0knhbhsj3yr90
bzr revid: shp@tinyerp.com-20121008111732-mmbws7oktf5h5yu2
2012-10-08 16:47:32 +05:30
Jalpesh Patel (OpenERP)
3f9c92408d
[Merge] Merge with lp:openobject-addons
...
bzr revid: pja@tinyerp.com-20121008111656-yue1tyykylg5do23
2012-10-08 16:46:56 +05:30
258966eab4
[ADD]Cecile's services in comment in data values. To work on.
...
bzr revid: dle@openerp.com-20121008111009-vh5n2pvu3kraof1m
2012-10-08 13:10:09 +02:00
Olivier Dony
180549c72e
[MERGE] OPW 577045: translate: properly export and translate terms in XSL-based reports
...
This patch comes with a related patch on addons which
fixes a lot of cases of terms that were not properly
translated in reports, due to improper use of the
translation system. The addons patch also adds a
lot of missing entries in the POT files.
bzr revid: odo@openerp.com-20121008110946-21984tjvhoy8zkx9
2012-10-08 13:09:46 +02:00
Randhir Mayatra (OpenERP)
eaad4bfbfd
[IMP] make changes into the account_analytic_journal file
...
bzr revid: rma@tinyerp.com-20121008110752-iifox2qnqap9s0pa
2012-10-08 16:37:52 +05:30
Mayur Maheshwari (OpenERP)
9487c2d9ba
[IMP]account : improve string
...
bzr revid: mma@tinyerp.com-20121008110549-zt946y9190avok3d
2012-10-08 16:35:49 +05:30
ggh-openerp
4dd9a36f6e
[IMP] Remove add_last in on_saved method
...
bzr revid: ggh@tinyerp.com-20121008110346-r0dzmjy3161bxglb
2012-10-08 16:33:46 +05:30
Chris Biersbach
c79543ee4d
[FIX] Wrong indentation fixed
...
bzr revid: cbi@openerp.com-20121008105800-kkfah0x3l0z9hg3a
2012-10-08 12:58:00 +02:00
Mayur Maheshwari (OpenERP)
79b2eae9eb
[IMP]all : improve button string
...
bzr revid: mma@tinyerp.com-20121008105222-9n6sfk9xnerfwxgj
2012-10-08 16:22:22 +05:30
Stephane Wirtel
b641983fbf
[MERGE] get the notifications from openerp
...
bzr revid: stw@openerp.com-20121008105034-6xu2xrnun8rm2g8x
2012-10-08 12:50:34 +02:00
Divyesh Makwana (Open ERP)
9c58413280
[IMP] mrp : In manufacturing orders, 'Consumed product' should have an 'S'.
...
bzr revid: mdi@tinyerp.com-20121008104935-pdeix1mw0do90z19
2012-10-08 16:19:35 +05:30
3967c43dda
[FIX] Fixed process.js, unuseful code.
...
bzr revid: vta@openerp.com-20121008104531-5bfhwx6yoxwicnmw
2012-10-08 12:45:31 +02:00
Divyesh Makwana (Open ERP)
9a264c3369
[IMP] There is no consistency throughout OpenERP with 'Source document', 'Source', 'Origin'. It should always be 'Source document'.
...
bzr revid: mdi@tinyerp.com-20121008104151-opvu1mig2xbxxpli
2012-10-08 16:11:51 +05:30
3bd6faabc0
[FIX] Fixed more r.result issues.
...
bzr revid: vta@openerp.com-20121008104047-sfsni7u3eugeepoz
2012-10-08 12:40:47 +02:00
Tejas Tank
ecd65f4b88
Merge with latest.
...
bzr revid: tta@openerp.com-20121008104039-ejm0z24yq5ez63hf
2012-10-08 16:10:39 +05:30
niv-openerp
c9a79627f3
[IMP] added code to download google frame
...
bzr revid: nicolas.vanhoren@openerp.com-20121008103700-8glev3xtzyue7for
2012-10-08 12:37:00 +02:00
Mayur Maheshwari (OpenERP)
92d7b599cf
[IMP]base : improve manu string and demo data
...
bzr revid: mma@tinyerp.com-20121008103013-bis8xilyyqjv6far
2012-10-08 16:00:13 +05:30
Divyesh Makwana (Open ERP)
31336151de
[IMP] mrp_byproduct : Renamed 'subproduct' to 'byproduct'.
...
bzr revid: mdi@tinyerp.com-20121008102836-rwd3ooy413yxqou8
2012-10-08 15:58:36 +05:30
Mayur Maheshwari (OpenERP)
48ad382705
[IMP]all : improve string
...
bzr revid: mma@tinyerp.com-20121008101422-hen3r94996e6pzye
2012-10-08 15:44:22 +05:30
Antonin Bourguignon
c7bf6a6dfd
[MERGE] base_calendar: improve code style and view
...
bzr revid: abo@openerp.com-20121008101338-s0x5ov4wk6841ycl
2012-10-08 12:13:38 +02:00
Tejas Tank
dd19cbb65a
[IMP] Small fix for display issue.
...
bzr revid: tta@openerp.com-20121008101327-lkzvw3wdarhcyht8
2012-10-08 15:43:27 +05:30
Quentin (OpenERP)
d058f68e2f
[IMP] account: search view
...
bzr revid: qdp-launchpad@openerp.com-20121008101144-bx103sqfkhd03a21
2012-10-08 12:11:44 +02:00
Quentin (OpenERP)
109d418de0
[IMP] hr_expense: search view
...
bzr revid: qdp-launchpad@openerp.com-20121008101131-r34boe2joemso1mu
2012-10-08 12:11:31 +02:00
Quentin (OpenERP)
da443ff975
[IMP] hr: removed job and manager from hr.employee search view
...
bzr revid: qdp-launchpad@openerp.com-20121008100547-nlos20k0xyz3f72e
2012-10-08 12:05:47 +02:00
Tejas Tank
4fb104ffee
[IMP] Depend on UOM type computation layout change.
...
bzr revid: tta@openerp.com-20121008100046-x93cu80uh9epdq21
2012-10-08 15:30:46 +05:30
Quentin (OpenERP)
0cfb72791d
[IMP] renamed filter 'Inbox' into 'Unread Messages' which is clearer
...
bzr revid: qdp-launchpad@openerp.com-20121008100032-mh7sd740fhsbjemr
2012-10-08 12:00:32 +02:00
pankita shah (Open ERP)
da24be3c60
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: shp@tinyerp.com-20121008095003-ni4sv05fylxg3wx9
2012-10-08 15:20:03 +05:30
ggh-openerp
f893835350
[IMP] Remove add_last in on_created method
...
bzr revid: ggh@tinyerp.com-20121008094924-uawry36sh9ffz8ut
2012-10-08 15:19:24 +05:30
Antonin Bourguignon
205a268a9d
[IMP] tests: don't repeat default values
...
bzr revid: abo@openerp.com-20121008094348-ph2km66db0k3ho7a
2012-10-08 11:43:48 +02:00
Frédéric van der Essen
85b3bb8038
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121005144746-n5agm0t48a35v1of
bzr revid: fva@openerp.com-20121008093823-vo8rtekjmoepjtd1
2012-10-08 11:38:23 +02:00
Frédéric van der Essen
1b5c7111f6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121008093552-nnf1ax5ueiotjtej
2012-10-08 11:35:52 +02:00
pankita shah (Open ERP)
667da9253f
[IMP] Exprience instead of Experience
...
bzr revid: shp@tinyerp.com-20121008093456-ff27x03xt89v4og3
2012-10-08 15:04:56 +05:30
Vishmita
777243bef3
[Fix]Improve code
...
bzr revid: vja@tinyerp.com-20121008093315-tnfnrr0rhum2yyoy
2012-10-08 15:03:15 +05:30
Divyesh Makwana (Open ERP)
39eea5b86c
[IMP] procurement : 'Compute schedulers' should be 'Run schedulers'.
...
bzr revid: mdi@tinyerp.com-20121008093050-xvhx0vtz010xk2qg
2012-10-08 15:00:50 +05:30
vta vta@openerp.com