5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
d7d6833965
[FIX] sale: layout of description page
...
bzr revid: rim@openerp.com-20140429090502-32u7vf7zntxnoruk
2014-04-29 11:05:02 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
b6255eb55d
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
...
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
b981f3f8ef
[FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
...
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name
bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
322eebf3f7
[FIX] sale: move demo data from sale to sale_stock
...
A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data
bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
2014-04-22 12:50:39 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
a17c16a660
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140417110726-8w4oktk7ml416ld7
bzr revid: ged@openerp.com-20140417130144-42bkw3f55xosxnks
2014-04-17 15:01:44 +02:00
4c1a345ad4
[Merge] Merged with trunk.
...
bzr revid: mdi@tinyerp.com-20140416043234-ygtv29jxhiq1io0e
2014-04-16 10:02:34 +05:30
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
733f344ff6
[IMP] add 'report' in sale dependancy
...
bzr revid: rma@tinyerp.com-20140414120915-3huithw6481rss0j
2014-04-14 17:39:15 +05:30
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
15725997dd
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
85714eabb6
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
63e9150cff
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
2014-04-11 05:59:30 +00:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
7715bf1823
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2
...
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
2014-04-09 18:31:32 +02:00
32f4824434
[MERGE][FIX] sale: sale order report, pto in invoice template should not cover the whole document
...
Courtesy of Stefan Rijnhart (Therp)
bzr revid: dle@openerp.com-20140408193910-2vztatyowndyasj9
2014-04-08 21:39:10 +02:00
c20483a1dd
[FIX] sale : Don't allow line creation in confirmed sale oder.
...
bzr revid: mdi@tinyerp.com-20140408053552-ovo33f2nkhaj6goe
2014-04-08 11:05:52 +05:30
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
e1bf5bd97c
[IMP] Report: renamed 'render_doc' method as 'translate_doc' for better understanding and added it a 'lang_field' attribute to explicitely set the lang. Adapted report_invoice, report_saleorder, report_overdue and report_intrastatinvoice this way.
...
bzr revid: sle@openerp.com-20140408134953-vql9ft8cosoanixt
2014-04-08 15:49:53 +02:00
4983f86d81
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
dc8246eb03
[ADD] sale_layout module allowing to set categories and subtotals on invoice and sale order
...
bzr revid: sle@openerp.com-20140404112308-aopihnefnf55b4er
2014-04-04 13:23:08 +02:00
8f174e13bd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
2014-04-04 07:07:59 +00:00
db6fb31870
[MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
...
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
33471e966f
[FIX] missing dependancies of report module
...
bzr revid: sle@openerp.com-20140403091818-6evr0k4r2k4818j1
2014-04-03 11:18:18 +02:00
4612b417af
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
7ee65aa181
[FIX] sale: remove useless write call (problematic when invoice on delivery order)
...
bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd
2014-03-31 12:44:48 +02:00
16ce262c33
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
9aadda1e1e
[MERGE]: Merge with addons branch
...
bzr revid: ypa@tinyerp.com-20140331095310-wkmxt02x6l85zho0
2014-03-31 15:23:10 +05:30
77ff3a69b8
[IMP] improve icons and views
...
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
598cf8d9b3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
2014-03-28 06:44:40 +00:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
c086291ddd
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
e61d12bfa7
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
...
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
2014-03-25 12:29:09 +01:00
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
8310cd1920
[FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
...
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices
bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
96ea9392aa
[IMP] convert button into stat button for products
...
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
f4b1d23cf2
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9159 revid:dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
...
bzr revid: dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
2014-03-24 12:03:49 +01:00
04f632820b
[FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
...
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
b51066b500
[IMP] convert button into stat button for customer
...
bzr revid: rma@tinyerp.com-20140320134414-mk1ie8okynrtudsq
2014-03-20 19:14:14 +05:30
948799e259
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
2014-03-16 05:42:24 +00:00
Gery Debongnie
Antony Lesuisse
Richard Mathot (OpenERP)
Christophe Simonis
Denis Ledoux
Martin Trigaux
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
DJ Patel
Randhir Mayatra rma-openerp
Simon Lejeune
Yogesh Parekh (OpenERP)