Jigar Amin
92747ecf67
[MERGE] sale_contracts: Contract -> Expense default anatical account should be contract
...
bzr revid: jam@tinyerp.com-20121121072752-xmprhjuqgpadkls7
2012-11-21 12:57:52 +05:30
b54a3ba13b
[FIX] Fixed groupby kanban view in claims and issues.
...
bzr revid: vta@openerp.com-20121121072503-b05nj56tscurznz9
2012-11-21 08:25:03 +01:00
Divyesh Makwana (Open ERP)
e4bb420d43
[IMP] Modules list view : create = false (should not have a button to create modules).
...
bzr revid: mdi@tinyerp.com-20121121072422-9c2q9bv1u0s8ff3f
2012-11-21 12:54:22 +05:30
Turkesh Patel (Open ERP)
16a5675fbe
[IMP] improved typo.
...
bzr revid: tpa@tinyerp.com-20121121072240-wzj3rujgzf63s6fc
2012-11-21 12:52:40 +05:30
ajay javiya (OpenERP)
049b231017
[REM]: Remove unwanted code
...
bzr revid: aja@tinyerp.com-20121121072014-yt1otcr3xn5gakfy
2012-11-21 12:50:14 +05:30
pankita shah (Open ERP)
a232b85590
[IMP] in height,width,length add cm and imrove stock Journal, and imrove date_done field in incomming_shippment,internal moves and delivery order
...
bzr revid: shp@tinyerp.com-20121121071718-cl9dbck5nd37i9ei
2012-11-21 12:47:18 +05:30
Jigar Amin
a99f8ec994
[MERGE] hr_timesheet_sheet : Open the Employee timesheet from user and no timsheet journal defined check is done for diff user
...
hr_holidays: leave type tool has been removed
hr_appriasal : removed the fromprint survey button
bzr revid: jam@tinyerp.com-20121121071659-j5b8l4snxb7hgepi
2012-11-21 12:46:59 +05:30
ajay javiya (OpenERP)
0e438f2671
[IMP]:Improve code in lunch module
...
bzr revid: aja@tinyerp.com-20121121071304-i1ce7134f6jlximn
2012-11-21 12:43:04 +05:30
Randhir Mayatra (OpenERP)
e1c947ad20
[IMP] make changes into mail
...
bzr revid: rma@tinyerp.com-20121121070901-vy7s76adxyqobb2z
2012-11-21 12:39:01 +05:30
pankita shah (Open ERP)
07d8989c64
[MERGE] merge lp:~openerp-dev/openobject-addons/trunk-addons21_warehouse_imp-ssu
...
bzr revid: shp@tinyerp.com-20121121065509-k4bt3z1rjp4yrj81
2012-11-21 12:25:09 +05:30
Hiral Patel (OpenERP)
0b995d57d1
[IMP] Remove debug mode after logout
...
bzr revid: hip@tinyerp.com-20121121064527-pojijc3a7ksxnroy
2012-11-21 12:15:27 +05:30
Jigar Amin
7ddfa0a0ae
[MERGE] Usbality Fix
...
bzr revid: jam@tinyerp.com-20121121064412-36k9inb0xpb81prx
2012-11-21 12:14:12 +05:30
Foram Katharotiya (OpenERP)
dc845feafa
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121121064245-jnl62o4h70d80mte
2012-11-21 12:12:45 +05:30
Jigar Amin
64373975fb
[MERGE] Contracts : Sale order possible only if Partner is selected
...
he_timesheet_invoice : unclear error message when Invoicing on timesheets
Put the menu Journal Entries > Journal Voucher in base.group_no_one
bzr revid: jam@tinyerp.com-20121121063440-cfejhzuxl9lme0j0
2012-11-21 12:04:40 +05:30
Turkesh Patel (Open ERP)
72a4ccff72
[IMP] add filter for create and delete access in serch view of record rules.
...
bzr revid: tpa@tinyerp.com-20121121063248-41j8t56wc17hiw7f
2012-11-21 12:02:48 +05:30
Sanjay Gohel (Open ERP)
a9d217fc79
[IMP]in contract opne expense set default analytic account in lines and open correct view for expense link
...
bzr revid: sgo@tinyerp.com-20121121062556-znkdc82emi892uu0
2012-11-21 11:55:56 +05:30
Nimesh (Open ERP)
11bf67d192
[IMP] improve waring and remove unused lines.
...
bzr revid: nco@tinyerp.com-20121121062529-lt0yf4imqajvel47
2012-11-21 11:55:29 +05:30
Randhir Mayatra (OpenERP)
7b27d67bc4
[IMP] make changes into project
...
bzr revid: rma@tinyerp.com-20121121062518-c8dna23myzgwgbgb
2012-11-21 11:55:18 +05:30
0806190054
[IMP] add exception message on deletion of partner if there is any related user existed
...
bzr revid: rgaopenerp-20121121062307-ppqfjdzlk6p95e51
2012-11-21 11:53:07 +05:30
Vijaykumar Baladaniya
4cbd5c58fc
[IMP]Add section_id in the invoice analysis report.
...
bzr revid: vba@tinyerp.com-20121121055817-3sw9yoac1xv12l2i
2012-11-21 11:28:17 +05:30
3fd4adbc5e
Merge with trunk
...
bzr revid: rgaopenerp-20121121054804-6n8o1r0sr1f7cbvc
2012-11-21 11:18:04 +05:30
Nimesh (Open ERP)
542b048b3f
[IMP] group the lines for similar produt/ratio by changeing query.
...
bzr revid: nco@tinyerp.com-20121121054647-2k7hvqyz0s4ah45h
2012-11-21 11:16:47 +05:30
9b54de9c87
[REV] remove last commit of exception message
...
bzr revid: rgaopenerp-20121121054543-urly4lk6vk62gd9l
2012-11-21 11:15:43 +05:30
Khushboo Bhatt (Open ERP)
17ecd10a35
[ADD/IMP]hr_expense:added method for message in expense
...
bzr revid: kbh@tinyerp.com-20121121053954-6japxu5y7tjilw9y
2012-11-21 11:09:54 +05:30
Divyesh Makwana (Open ERP)
a6c4a82ad1
[Merge] Merge the Sales/CRM section.
...
bzr revid: mdi@tinyerp.com-20121121053405-l0djdvl84m0oqts8
2012-11-21 11:04:05 +05:30
ajay javiya (OpenERP)
5165d8b240
[IMP]: Put the menu Journal Voucher in base.group_no_one
...
bzr revid: aja@tinyerp.com-20121121051555-qb9hfomrnsvp21bv
2012-11-21 10:45:55 +05:30
Jigar Amin
85744afe7f
[FIX] Open marketing on campaign
...
bzr revid: jam@tinyerp.com-20121121051245-y37c4heicus8sdo9
2012-11-21 10:42:45 +05:30
Sanjay Gohel (Open ERP)
86b2d142f8
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20121121050935-dfdg7sgjbhidru3p
2012-11-21 10:39:35 +05:30
Vijaykumar Baladaniya
d6e87438d9
[IMP] Add a group by on invoice tree for salesteam.
...
bzr revid: vba@tinyerp.com-20121121050215-jswj8y7khi6ap37n
2012-11-21 10:32:15 +05:30
Randhir Mayatra (OpenERP)
d2a53149c1
[MERGE] merge with trunk
...
bzr revid: rma@tinyerp.com-20121121045840-g7wwhicdnqhofi81
2012-11-21 10:28:40 +05:30
Jigar Amin
902507d67a
[MERGE] sync with trunk
...
bzr revid: jam@tinyerp.com-20121121045755-bbso1f97uxx5w8wl
2012-11-21 10:27:55 +05:30
ajay javiya (OpenERP)
1ba8ba7ba8
[IMP]: Replace empty messages exclamation mark
...
bzr revid: aja@tinyerp.com-20121121045742-pshwk91y27vw29ws
2012-11-21 10:27:42 +05:30
Foram Katharotiya (OpenERP)
3310cec955
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121121045700-h709dxvwui0r7nj2
2012-11-21 10:27:00 +05:30
Jigar Amin
42e2cb61fd
[MERGE] Sync with trunk
...
bzr revid: jam@tinyerp.com-20121121045625-nl82coj2lk2lumhw
2012-11-21 10:26:25 +05:30
Foram Katharotiya (OpenERP)
af4d44d54f
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121121045400-g4yh2a5ut04k6bco
2012-11-21 10:24:00 +05:30
Divyesh Makwana (Open ERP)
d7ebb89a81
[Merge] Merge with main server.
...
bzr revid: mdi@tinyerp.com-20121121045232-kxqjlguqkcalhv8y
2012-11-21 10:22:32 +05:30
Foram Katharotiya (OpenERP)
1a203c4328
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121121045112-60ua4lrarhn4n0ye
2012-11-21 10:21:12 +05:30
Divyesh Makwana (Open ERP)
d57d78cbb4
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121121045109-pcm8ld8svcbrj16z
2012-11-21 10:21:09 +05:30
e5133ecca4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121121044818-2zv06h9572h362aw
2012-11-21 04:48:18 +00:00
3eb3d5bb6b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121121044755-oo3gvj8xlcswn1xq
2012-11-21 04:47:55 +00:00
Jigar Amin
dee1af1c9d
[MERGE] Sync with trunk
...
bzr revid: jam@tinyerp.com-20121121044515-kwjy3okxx13nzeo4
2012-11-21 10:15:15 +05:30
ajay javiya (OpenERP)
277fbe16ae
[FIX]: Fix issue in sale module
...
bzr revid: aja@tinyerp.com-20121121043126-0ej6ij6f0dr7ysn8
2012-11-21 10:01:26 +05:30
Antonin Bourguignon
342680e244
[IMP] code style and documentation
...
bzr revid: abo@openerp.com-20121120181536-vmgw4a5qo03qs5ga
2012-11-20 19:15:36 +01:00
Antonin Bourguignon
4e64f8e96f
[WIP] redirect to the right view (opp or lead)
...
improve documentation and code style
bzr revid: abo@openerp.com-20121120181333-ho2zu27q1qs2hoe5
2012-11-20 19:13:33 +01:00
Christophe Simonis
1782d61e44
[FIX] web: pass env in login_and_redirect
...
bzr revid: chs@openerp.com-20121120180933-ktarob0a3ll4ccsn
2012-11-20 19:09:33 +01:00
Olivier Dony
437833ba43
[MERGE] Review/Update EDI features for 7.0:
...
Some EDI features replaced by the improved 7.0 portal (with auth_signup)
------------------------------------------------------------------------
- remove the static export of EDI document and the persistence of these EDI blobs, replaced by the live portal access to the document (via portal module)
- remove all the qweb templates and web controllers that were previously used to give access to the EDI document preview
- preserve the web controllers/URLs that were use for the direct EDI import (so that a document from a 6.1 system can still be imported in a 7.0 system)
- temporarily remove the EDI export UI, replaced for the time being by the portal view. => It is planned in 7.1 to provide a new EDI export system via email notification and attaching JSON EDI blobs to outgoing emails. Thanks to the mail gateway integration and a whitelist/certificate system it will be possible to setup end-to-end B2B EDI automation.
- EDI email notifications now integrated in Sales/Invoicing flows via an explicit "Send by Email" step
- PDF version of the document now sent along with the notification (instead of a simple link to view it)
- Portal signup link integrated in this notification when the portal module is installed (via glue module sale_portal)
Online Payment (Paypal) features preserved in a different form
--------------------------------------------------------------
- as the EDI preview was removed, the payment button was moved to a new banner in the portal view of relevant documents, as follows:
- addition of a new portal.payment_acquirer model to define online payment gateways such as Paypal, Google Checkout, etc. (Paypal included by default)
- new payment banner added to the portal form view of Sale Orders and Customer Invoices, allowing online payment via defined payment_acquirers
- new settings item in Settings>Invoicing>Banks&Cash to make the payment banner visible to all employees as well (normally it's only visible in the portal)
+ minor cleanup and removal of deprecated fields
bzr revid: odo@openerp.com-20121120170915-cmb77iubyrwmib2l
2012-11-20 18:09:15 +01:00
Olivier Dony
b770240247
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
2012-11-20 17:34:29 +01:00
Cedric Snauwaert
d9c266eeb4
[FIX]some minor corrections and TODO comments
...
bzr revid: csn@openerp.com-20121120162930-hwj1ilshe99uvyau
2012-11-20 17:29:30 +01:00
Christophe Simonis
e7b2ec50fe
merge upstream
...
bzr revid: chs@openerp.com-20121120162812-wb04dwv62v25evtj
2012-11-20 17:28:12 +01:00
Christophe Matthieu
53d35debfd
[FIX] mail followers: invisible attribute and mode create
...
bzr revid: chm@openerp.com-20121120162434-g5wfgwndozrcstld
2012-11-20 17:24:34 +01:00
Jigar Amin