Commit Graph
65915 Commits
Author SHA1 Message Date
Quentin (OpenERP) 057ca2072c [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130173008-4ew25fx09uamyyp6
2012-11-30 18:30:08 +01:00
Quentin (OpenERP) a68e5f9041 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121130171130-dugntyqmjunwr20m
2012-11-30 18:11:30 +01:00
Antonin Bourguignon 60884cc4f6 [MERGE] trunk
bzr revid: abo@openerp.com-20121130170307-732mw3b7zjkc9l9l
2012-11-30 18:03:07 +01:00
Antonin Bourguignon a38bdc15c5 [IMP] introduce tests for the salesmen assignations
bzr revid: abo@openerp.com-20121130170034-7f5ytzptsks997oq
2012-11-30 18:00:34 +01:00
Antonin Bourguignon a9f67c3729 [IMP] indentation
bzr revid: abo@openerp.com-20121130165958-eg00un2qhipubcwr
2012-11-30 17:59:58 +01:00
Olivier Dony 43e8cda76d [MERGE] Bugfixes from 6.1 until revision 6700
Rev.6700 is xal@openerp.com-20120323142541-ebxn935mdfk7bk9s

bzr revid: odo@openerp.com-20121130165415-0yujyc1mkl7lsmd4
2012-11-30 17:54:15 +01:00
Quentin (OpenERP) 56e72783ae [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130165350-btj0wcm1u3ejyp3f
2012-11-30 17:53:50 +01:00
Quentin (OpenERP) 79d1871d07 [IMP] account: removed duplicated entry for journal items to reconcile
bzr revid: qdp-launchpad@openerp.com-20121130163848-f898vghiiw9f7rl3
2012-11-30 17:38:48 +01:00
Quentin (OpenERP) 73c53b4071 [FIX] account_voucher: pay invoice propose the good partner (parent if not a company)
bzr revid: qdp-launchpad@openerp.com-20121130163528-zjjncja58hhnyflh
2012-11-30 17:35:28 +01:00
Quentin (OpenERP) 4d3260d92b [IMP] analytic: don't display the full name of templates in name_get()
bzr revid: qdp-launchpad@openerp.com-20121130163445-zaetj2o42s2jjwly
2012-11-30 17:34:45 +01:00
Quentin (OpenERP) 3f94a66d1e [REF] account_followup: code review
bzr revid: qdp-launchpad@openerp.com-20121130162401-7g0xm5p7nrbz026e
2012-11-30 17:24:01 +01:00
Olivier Dony a1d79115e5 [MERGE] Fix sale.order.line's invoiced flag, as part of forward-port of 6.1 server bugfixes
After forward-porting the 6.1 server bugfixes to trunk, a hidden bug
was revealed in the way sale.order.line's `invoiced` field
is updated. It makes the sale/test/cancel_order.yml test fail,
because the "recreate invoice" action does not work properly
if there are multiple cancelled invoices, due to incorrect
and outdated `invoiced` values on sale.order.lines.

By replacing the invoiced field with a stored fields.function
we simplify the code and fix this incorrect behavior at the
same time.

bzr revid: odo@openerp.com-20121130161809-0sf3z8k2530ze2zl
2012-11-30 17:18:09 +01:00
Olivier Dony 93a28103db [MERGE] Forward-port of 6.1 bugfixes up to rev. 4307
rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj

bzr revid: odo@openerp.com-20121130160523-nte65mkgp3y330n6
2012-11-30 17:05:23 +01:00
Antonin Bourguignon aabe51a5ed [IMP] test messages
bzr revid: abo@openerp.com-20121130154850-9nqciuno6euckoo4
2012-11-30 16:48:50 +01:00
Quentin (OpenERP) 1de4c8e210 [FIX] account_followup: multi currency handling
bzr revid: qdp-launchpad@openerp.com-20121130154208-q3gj23y9iqq92ko1
2012-11-30 16:42:08 +01:00
Christophe Simonis 415dc94a9d [FIX] test_reports.py: use communicate() to avoid creating zombie processes
bzr revid: chs@openerp.com-20121130152937-xcgs9bxrw7vyewex
2012-11-30 16:29:37 +01:00
Antonin Bourguignon 6c53679c84 [IMP] tests for the merge feature
bzr revid: abo@openerp.com-20121130151413-07ezgnoaiuopsd90
2012-11-30 16:14:13 +01:00
vta vta@openerp.com c1a1f51ae5 [IMP] Portal auto_install, and all dependencies also.
bzr revid: vta@openerp.com-20121130151346-uyl4t6fr1990f756
2012-11-30 16:13:46 +01:00
vta vta@openerp.com f8ebf98c96 [FIX] Better distribution of access rules for SO when stock is installed.
bzr revid: vta@openerp.com-20121130151310-b80fmgq0a9veogt0
2012-11-30 16:13:10 +01:00
niv-openerp 053d6af231 [FIX] forgot to modify test after API change
bzr revid: nicolas.vanhoren@openerp.com-20121130140335-k1nus3oz1xw6deeu
2012-11-30 15:03:35 +01:00
Xavier Morel 4102c43793 [FIX] trailing comma in array
bzr revid: xmo@openerp.com-20121130133021-dg09qnw9twz2v4ws
2012-11-30 14:30:21 +01:00
Antonin Bourguignon e7de389f4b [WIP] introduce tests for the merge feature
bzr revid: abo@openerp.com-20121130125105-f1ewkix6t6saiu8l
2012-11-30 13:51:05 +01:00
vta vta@openerp.com c0b2adfb5f [FIX] Hide 'View Delivery Order' button to portal users.
bzr revid: vta@openerp.com-20121130124252-1hge2mo5sz33atlw
2012-11-30 13:42:52 +01:00
Harry (OpenERP) a3dbfa2811 [MERGE] event_sale: event field should be have label and appear near to product in sale order line
bzr revid: hmo@tinyerp.com-20121130123921-911rxlkewwat4u4w
2012-11-30 18:09:21 +05:30
vta vta@openerp.com f5bd40cc6c [FIX] Fixed issue accessing SO when warehouse module installed.
bzr revid: vta@openerp.com-20121130123826-mrrxrvpufdk97mu9
2012-11-30 13:38:26 +01:00
vta vta@openerp.com 34ccbd8d6d [REM] Remove stupid code -_-U.
bzr revid: vta@openerp.com-20121130113522-4bpshiltidprwr5c
2012-11-30 12:35:22 +01:00
Ajay Chauhan (OpenERP) 72e6e33475 [IMP] crm: changed filter string & help
bzr revid: cha@tinyerp.com-20121130111705-gii2q1i5v13f3pfd
2012-11-30 16:47:05 +05:30
Xavier Morel e137c9d747 [FIX] translations and other failings
always include a ``context`` param in rpc requests if none is
provided: use the user_context at the very least

lp bug: https://launchpad.net/bugs/1084963 fixed

bzr revid: xmo@openerp.com-20121130103651-4pf5bauj50cm151y
2012-11-30 11:36:51 +01:00
Xavier Morel 5d313f1754 [FIX] styllistic fixes
bzr revid: xmo@openerp.com-20121130103638-8r77jpmb3hhmo8dt
2012-11-30 11:36:38 +01:00
Sanjay Gohel (Open ERP) 4cacdeaead [IMP]improve filter which are not working
bzr revid: sgo@tinyerp.com-20121130102948-gy5aqp4rffdk4gv5
2012-11-30 15:59:48 +05:30
Fabien Pinckaers 33048d7c79 [IMP] merge addons23
bzr revid: fp@openerp.com-20121130100516-r0gspmovo8ebdqi0
2012-11-30 11:05:16 +01:00
Antonin Bourguignon 4781eec49d [MERGE] trunk
bzr revid: abo@openerp.com-20121130095538-4yxjx2smpohs27nd
2012-11-30 10:55:38 +01:00
Cedric Snauwaert e1ff74df35 [FIX]fleet : generation of contract cost should take into account current day too
bzr revid: csn@openerp.com-20121130095449-cypcvs98q76vlurp
2012-11-30 10:54:49 +01:00
Rajesh Prajapati (OpenERP) 2c130707a7 [IMP] General : Mark Read and Mark Unread removed from all objects
bzr revid: rpr@tinyerp.com-20121130095239-e60l299dut71x5ng
2012-11-30 15:22:39 +05:30
niv-openerp 94dca54e38 [IMP] removed date.today() in pyeval
bzr revid: nicolas.vanhoren@openerp.com-20121130095228-mffq2407lq7tf8jj
2012-11-30 10:52:28 +01:00
niv-openerp 7b48ff70be [IMP] Removed usage of method date.today() in xml files.
bzr revid: nicolas.vanhoren@openerp.com-20121130095104-fnh6yxkvb0cxgc50
2012-11-30 10:51:04 +01:00
vta vta@openerp.com 5f5f3d9942 [FIX] Online payment ribbon display conditions.
bzr revid: vta@openerp.com-20121130094501-lz430j8fgin9cacj
2012-11-30 10:45:01 +01:00
Tejas Tank f7fda1fd27 Merged Latest.
bzr revid: tta@openerp.com-20121130094008-ik780608h4dt0x00
2012-11-30 14:40:08 +05:00
Tejas Tank f15d9483c2 Merged Latest.
bzr revid: tta@openerp.com-20121130093948-96mo9zas2w27jizj
2012-11-30 14:39:48 +05:00
Hardik 3fc7e06583 [IMP]Set Indentation for Accoutning tooltip
bzr revid: hsa@tinyerp.com-20121130091826-q1d3xs4mlyzhosi5
2012-11-30 14:48:26 +05:30
Quentin (OpenERP) e786a1675b [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130091824-e3xhak3k9z2anihv
2012-11-30 10:18:24 +01:00
Ajay Chauhan (OpenERP) 7d968c3590 [IMP] account_analytic_analysis: made changes in filters
bzr revid: cha@tinyerp.com-20121130085046-0p4etgeiwdismala
2012-11-30 14:20:46 +05:30
Jalpesh Patel (OpenERP) 147eba6c77 [Merge] Merge with lp:openobject-addons
bzr revid: pja@tinyerp.com-20121130083958-hayz6kjpmj6u63n6
2012-11-30 14:09:58 +05:30
Fabien Pinckaers f5e755c409 [IMP] saving space for partners kanban
bzr revid: fp@openerp.com-20121130082137-97qibfk3k0v6y51l
2012-11-30 09:21:37 +01:00
Tejas Tank 2db99b7b8b [IMP] When Employee created relatevent Appraisal create with evaluation date if already set.
bzr revid: tta@openerp.com-20121130081541-og07m4bkjoqny4et
2012-11-30 13:15:41 +05:00
Nimesh (Open ERP) 2f3d541801 [IMP] add prodcut_id field in view to filter by product.
bzr revid: nco@tinyerp.com-20121130075535-hclf733wzodbeqgt
2012-11-30 13:25:35 +05:30
Jalpesh Patel (OpenERP) 213f25421f [IMP]solve problem of group by filters source,destination,creation in warehouse
bzr revid: pja@tinyerp.com-20121130073057-2kcyr0148bpw88ub
2012-11-30 13:00:57 +05:30
Fabien Pinckaers 8573ed18e6 [IMP] remove create button on modules
bzr revid: fp@openerp.com-20121130065511-x5eet7aanuazxqak
2012-11-30 07:55:11 +01:00
dhr af5afb4d73 [IMP]Renamed the id of crm_meeting_type for sale manager
bzr revid: dhr@tinyerp.com-20121130062628-vo4bjw14uau7dzom
2012-11-30 11:56:28 +05:30
Hardik f632741032 [MERGE]with latest trunk
bzr revid: hsa@tinyerp.com-20121130060829-247z7iizofc990ph
2012-11-30 11:38:29 +05:30