Foram Katharotiya (OpenERP)
ae664b1a86
[IMP] add currency_id because i had removed currency_id in merge conflict
...
bzr revid: fka@tinyerp.com-20130617071413-mie2x70lz4tzs48i
2013-06-17 12:44:13 +05:30
Foram Katharotiya (OpenERP)
5a761f9752
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
2013-06-17 12:26:36 +05:30
Jignesh Rathod (OpenERP)
db49e90ac3
Merge With latest code.
...
bzr revid: jir@tinyerp.com-20130617064123-ar2q2ujrwak6r6y3
2013-06-17 12:11:23 +05:30
ajay javiya (OpenERP)
ad1860b1e1
[MERGE]: with trunk
...
bzr revid: aja@tinyerp.com-20130617060259-8yftvih3bn3na45r
2013-06-17 11:32:59 +05:30
Foram Katharotiya (OpenERP)
4a9e4fcc9c
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617055011-jmp9p71kaqnaigsw
2013-06-17 11:20:11 +05:30
Foram Katharotiya (OpenERP)
a597517075
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617053102-hjol40tvdqku0wcy
2013-06-17 11:01:02 +05:30
Chirag Dodiya (OpenERP Trainee)
57de566d67
[MERGE] merge with server
...
bzr revid: chiragdd7@gmail.com-20130614064912-2fbrw3knc3kdzmbk
bzr revid: chiragdd7@gmail.com-20130617052728-kjzu2ngntuoj6r35
2013-06-17 10:57:28 +05:30
3fcf616697
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615052355-u6q4b22fmtl0ubgt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617052543-o6mypnj84iv69hz9
2013-06-17 05:25:43 +00:00
Atul Patel (OpenERP)
4887732bdd
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130617043951-xukg3kojn8p6f8e2
2013-06-17 10:09:51 +05:30
Atul Patel (OpenERP)
fa4c6c9ddb
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130617043251-u68mctnl61391f7c
2013-06-17 10:02:51 +05:30
50106b25e8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616043829-skwivcwkvq31nhfh
2013-06-16 04:38:29 +00:00
Olivier Dony
ca185a7d6d
[I18N] account: updated PO template for new term introduced by previous revision
...
bzr revid: odo@openerp.com-20130614223224-or0dod97c55x5qv9
2013-06-15 00:32:24 +02:00
Olivier Dony
138ff9cfd9
[MERGE] OPW 590139: account reports: several missing translation markers
...
The calls to _translate() do not actually work
in the Python helpers for the reports, unless the
terms are actually found in RML report source
(so translations of the right type exist).
Of course adding the terms in the RML directly
makes those helper methods redundant, so
they can now be removed in trunk.
Kept them in stable for API compatibility
only, they should work for existing reports.
lp bug: https://launchpad.net/bugs/1165321 fixed
bzr revid: odo@openerp.com-20130614213602-y325elmg3u5mq2qc
2013-06-14 23:36:02 +02:00
niv-openerp
bd5eaa5f92
Replaced routing by werkzeug routing
...
bzr revid: nicolas.vanhoren@openerp.com-20130614155250-2a29y2uv2255a79x
2013-06-14 17:52:50 +02:00
niv-openerp
c44888527b
Added werkzeug route building, not yet switched
...
bzr revid: nicolas.vanhoren@openerp.com-20130614152621-t8jv4474gt9k6yib
2013-06-14 17:26:21 +02:00
niv-openerp
faf2ef3d1a
Simplefied a little current routing
...
bzr revid: nicolas.vanhoren@openerp.com-20130614150125-w8fnyclnw0l8b3r7
2013-06-14 17:01:25 +02:00
Thibault Delavallée
ffeaa460ca
[MERGE] sale, point_of_sale, sale_stock: remove the concept of sale.shop
...
and replace it by stock.warehouse
Also include several fixes and improvements in sale/point of sale.
bzr revid: tde@openerp.com-20130614145848-6zmjkxz0zkqs9jxb
2013-06-14 16:58:48 +02:00
Martin Trigaux
d41b550fdc
[MERGE] [IMP] stock: filter incomming shipments and delivery orders on supplier and customer field
...
bzr revid: mat@openerp.com-20130614143842-8guj5z1243vg8nb0
2013-06-14 16:38:42 +02:00
Thibault Delavallée
e738adfafe
[FIX] sale, sale_stock: fixed calls to get_company taking an extra uid
...
bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7
2013-06-14 16:33:17 +02:00
Thibault Delavallée
1a51e9b88d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
Thibault Delavallée
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
Atul Patel (OpenERP)
8043a9242a
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130614135206-u0kxrrzioiyr9jvh
2013-06-14 19:22:06 +05:30
Darshan Kalola (OpenERP Trainee)
13ac97438d
[IMP]make ratio null and untick timesheet when untick invoice on timesheet option on contract
...
bzr revid: darshankalola@gmail.com-20130614134423-7itt49kbf09nq36t
2013-06-14 19:14:23 +05:30
ajay javiya (OpenERP)
9bc864e43c
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20130614133618-vyo15fh84e3kwb7j
2013-06-14 19:06:18 +05:30
Denis Ledoux
15558c64cf
[FIX]crm_partner_assign: partner view typo
...
bzr revid: dle@openerp.com-20130614132919-2f34su69jvv5xa2x
2013-06-14 15:29:19 +02:00
Denis Ledoux
cc7b573af8
[FIX]crm_partner_assign: lead/opp view some changes
...
bzr revid: dle@openerp.com-20130614132842-tbh09dt1m5cyzob4
2013-06-14 15:28:42 +02:00
Denis Ledoux
6b45fe6ae9
[FIX]mail: _postprocess_sent_message send all mail, not only type = email
...
bzr revid: dle@openerp.com-20130614132418-hfhf61vfmq28zmv0
2013-06-14 15:24:18 +02:00
ajay javiya (OpenERP)
929eea1aa3
[REM]: Remove Un-used mehtods when state is remove
...
bzr revid: aja@tinyerp.com-20130614132023-5t2rp27pv9pmd7in
2013-06-14 18:50:23 +05:30
ajay javiya (OpenERP)
a5cc3f4da6
[MERGE]:with trunk
...
bzr revid: aja@tinyerp.com-20130614123050-dl5y2xgit8x5hxqz
2013-06-14 18:00:50 +05:30
Denis Ledoux
23d40e2345
[MERGE]upstream
...
bzr revid: dle@openerp.com-20130614122854-le6s0u679k8kn547
2013-06-14 14:28:54 +02:00
niv-openerp
0ab2825e34
corrected test
...
bzr revid: nicolas.vanhoren@openerp.com-20130614122400-9xns98yv1k42gsoz
2013-06-14 14:24:00 +02:00
Thibault Delavallée
24a411d9eb
[MERGE] [IMP] Partner View: Partner View Improvement: remove history tab
...
This branch adds contextual buttons for the various items contained
in the history tab that are removed.
res.partner:
- in crm: re-ordered of the various Leads/Meetings/Opportunities buttons
- in crm_claim: added a Claims button, removed claims in history tab
- in event: removed one2many field towards event.event and event.registration, as well as other data related to history tab
- in marketing_campaigns: removed on2many field toward workitems (workitem_ids)
- in project: removed task from history; added Tasks button
- in project_issue: removed issues from history; added Issues button
bzr revid: tde@openerp.com-20130614121020-zl1l18iz9gv1smaa
2013-06-14 14:10:20 +02:00
Martin Trigaux
5836b9da50
[MERGE] [FIX] project_crm: sale_order_id does not appear in the correct location on project.task
...
lp bug: https://launchpad.net/bugs/1097808 fixed
bzr revid: mat@openerp.com-20130614120554-5k33fuv91beo7pcw
2013-06-14 14:05:54 +02:00
Thibault Delavallée
45780c147d
[IMP] Partner View Improvement: remove history tab.
...
This server branch comes with an addons branch where the various
items of the history tab are removed and transformed into
contextual buttons.
Names are added to two pages of the partner notebook to be able
to reference them in future inheritance.
bzr revid: tde@openerp.com-20130614120540-5qvvh07cu2quwi71
2013-06-14 14:05:40 +02:00
Foram Katharotiya (OpenERP)
85313adf74
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130614115657-apxfrw09k13lghbm
2013-06-14 17:26:57 +05:30
Foram Katharotiya (OpenERP)
a25953d00e
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130614115339-zggi0sujhwqg2gjc
2013-06-14 17:23:39 +05:30
Christophe Simonis
484148e8e4
[FIX] mail: compare splitted email in tests
...
bzr revid: chs@openerp.com-20130614114258-iar6h3ctaaqrb4on
2013-06-14 13:42:58 +02:00
Denis Ledoux
d0aff42a30
[FIX]crm_partner_assign: remove oe_link class from button
...
bzr revid: dle@openerp.com-20130614113359-sxt5fw2tsckgdlyd
2013-06-14 13:33:59 +02:00
Christophe Simonis
201a383c9c
[FIX] mail: reply_to is set to email_from as a last resort
...
bzr revid: chs@openerp.com-20130614103005-9x5r0b22b25jll1g
2013-06-14 12:30:05 +02:00
Denis Ledoux
617d59cd41
[FIX]crm_partner_assign: some view changes
...
bzr revid: dle@openerp.com-20130614101041-jegs9jglt0ymehrf
2013-06-14 12:10:41 +02:00
Christophe Simonis
1ae74e8907
[FIX] mail: default value for email_reply_to variable (merge messup)
...
bzr revid: chs@openerp.com-20130614094439-iqji8aimvaf4x5t6
2013-06-14 11:44:39 +02:00
ajay javiya (OpenERP)
f14eddbbe9
[IMP]:Remove State field from crm,hr_recruitment and project task/issue , Rename delay to open to Delay to Assign ,delay to close on Last Updates Dates,stage in searchview
...
bzr revid: aja@tinyerp.com-20130614092545-oxrhw0x3xewkhdjf
2013-06-14 14:55:45 +05:30
Jignesh Rathod (OpenERP)
d578a8f90a
Improve description.
...
bzr revid: jir@tinyerp.com-20130614092453-zs8hpnx3mutsmhhd
2013-06-14 14:54:53 +05:30
Christophe Simonis
aa133b4d29
[MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
...
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
Jignesh Rathod (OpenERP)
d704899df3
Improve module description and template.
...
bzr revid: jir@tinyerp.com-20130614085559-auji06qm3mbhc7j2
2013-06-14 14:25:59 +05:30
1a383fe7aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070435-bmt19sgu42mjyjg6
2013-06-14 07:04:35 +00:00
bth-openerp
ed7111368b
[MERGE]Merge lp:openobject-addons.
...
bzr revid: bth@tinyerp.com-20130614061519-aco9gv26dgjsbisb
2013-06-14 11:45:19 +05:30
bth-openerp
c85ee0e63c
[IMP]Use Relational field instead of char.
...
bzr revid: bth@tinyerp.com-20130614061331-cwvbtvnc4eik4asu
2013-06-14 11:43:31 +05:30
Darshan Kalola (OpenERP Trainee)
f10b2cd81d
[IMP]improve help of duration field of crm phonecall.
...
bzr revid: darshankalola@gmail.com-20130614060520-mla6kv106gkxz4lx
2013-06-14 11:35:20 +05:30
15a1e676e6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614053848-ivpev077e3o7v78m
2013-06-14 05:38:48 +00:00
Foram Katharotiya (OpenERP)