pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,376 Commits 1 Branch 0 Tags
cc05ab11dfd7e2070d2af9642808de34ec031add
Commit Graph
72376 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Dony 0f983a0146 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183 
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
 2013-06-03 14:18:52 +02:00
Vo Minh Thu a75706ea81 [IMP] module_data.xml: added Survey category (should replace Extra Tools soon). 
bzr revid: vmt@openerp.com-20130603115436-35z1rfvxtgdggryn
 2013-06-03 13:54:36 +02:00
Vo Minh Thu dea9c95ab7 [MERGE] tools.convert: allow to use relativedelta in XML files. 
bzr revid: vmt@openerp.com-20130603111716-lrgu1hxxz96escqa
 2013-06-03 13:17:16 +02:00
Mahendra Barad (OpenERP Trainee) 977ddc199e [IMP] In openerp report designer wizard remove the configure icon and in reporting configuration wizard remove skip button and put heighlighted ok button 
bzr revid: baradmahendra344@gmail.com-20130603105513-bwwovqplm5ypipv7
 2013-06-03 16:25:13 +05:30
Nimesh Contractor (OpenERP) 10cf84b77a [MERGE] with trunk. 
bzr revid: nco@tinyerp.com-20130603104529-1f7ir2rdfunv9uxn
 2013-06-03 16:15:29 +05:30
Martin Trigaux 667876728d [MERGE] [FIX] account: use the purchase or sale description for manual invoicing instead of product description, courtesy of Numérigraphe 
lp bug: https://launchpad.net/bugs/1101146 fixed

bzr revid: mat@openerp.com-20130603102627-6dokww7uhijvxlfk
 2013-06-03 12:26:27 +02:00
Thibault Delavallée 27b706e9fe [FIX] sale_crm: still fixing demo data. 
bzr revid: tde@openerp.com-20130603101200-6of26le663sw0jku
 2013-06-03 12:12:00 +02:00
Chandni Machchhar (OpenERP Trainee) b01c8dfafd [FIX] Aligned the employee field in employee timesheet wizard and change the parent of the Employee Timesheet menu. 
bzr revid: chandni.machchhar3@gmail.com-20130603100814-r12y6aw1m6bzvwv3
 2013-06-03 15:38:14 +05:30
Chandni Machchhar (OpenERP Trainee) 08040221b2 [FIX] Set the print or cancel buttons in the footer in all the wizards of Survey in reporting. 
bzr revid: chandni.machchhar3@gmail.com-20130603095843-q5eq7mqpiwepcly1
 2013-06-03 15:28:43 +05:30
Thibault Delavallée 0f1b903c02 [FIX] sale_crm_demo: fixed demo values for a field that had its name changed. 
bzr revid: tde@openerp.com-20130603094213-47rhtybwycqnragh
 2013-06-03 11:42:13 +02:00
Quentin (OpenERP) 232e24b7a4 [FIX] trml2pdf: reportlab 2.4.4 doesn't support the previous syntax (sname in self.default_style) 
bzr revid: qdp-launchpad@openerp.com-20130603093048-4iwgnb4hxhsxrazc
 2013-06-03 11:30:48 +02:00
Sejal Bhut (OpenERP Trainee) dcf8b5e830 [FIX] Database Backup Problem 
lp bug: https://launchpad.net/bugs/1100721 fixed

bzr revid: sejalpatel125@gmail.com-20130603092630-3rh4bewi3kihmub7
 2013-06-03 14:56:30 +05:30
Launchpad Translations on behalf of openerp 36c14f32d2 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601052916-cojcbyr1k926vl9n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601051656-7uhyux565iqufm24
bzr revid: launchpad_translations_on_behalf_of_openerp-20130603060229-es17t14hfn00d47h
 2013-06-03 06:02:29 +00:00
Launchpad Translations on behalf of openerp 9705c37dfa Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055923-2o80qu13ofm2jkfh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070111-eqt2i0xb3xqrth7p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055928-uap5zeq41e0317xt
 2013-06-01 05:59:28 +00:00
Thibault Delavallée 09e0cd8dc6 [CLEAN] crm, sale_crm: cleaned code for new fields. Fixed some bugs in calculation and monthly repartition. Updated form views. Improved use of sparkline widget, now having tootips. 
bzr revid: tde@openerp.com-20130531153100-q1cmpx0kjb02cbtu
 2013-05-31 17:31:00 +02:00
Paramjit Singh Sahota 212e50a8e0 [MERGE] Merged lp:openobject-addons. 
bzr revid: psa@tinyerp.com-20130531131036-bv93xdr6buacv0ac
 2013-05-31 18:40:36 +05:30
Paramjit Singh Sahota dfb516fb5d [IMP] created a new record rule for the technical features group. 
bzr revid: psa@tinyerp.com-20130531130912-ee0ptpjv27id4l32
 2013-05-31 18:39:12 +05:30
Quentin (OpenERP) fe7866ccec [FIX] crm: after a merge of several leads/opportunities, delete the old records as the SUPERUSER to avoid security issues. 
bzr revid: qdp-launchpad@openerp.com-20130531123414-ezx9ixg9ggame1g6
 2013-05-31 14:34:14 +02:00
Quentin (OpenERP) 4eb57678cb [FIX] sale_margin: when sharing a SO with a customer, don't show the margin 
bzr revid: qdp-launchpad@openerp.com-20130531122745-lkhi0nftibhu325j
 2013-05-31 14:27:45 +02:00
Quentin (OpenERP) 5b83d03ac1 [FIX] account, usability: restrict the choice of the account to the ones with type 'other' for income and expense account of product and invoice line 
bzr revid: qdp-launchpad@openerp.com-20130531121945-fjb9y6rj3k9qd4m9
 2013-05-31 14:19:45 +02:00
Quentin (OpenERP) 031dbeb01a [FIX] hr: display the employee instead of the user in the calendar view 
bzr revid: qdp-launchpad@openerp.com-20130531121351-iirl3ukuojphy21z
 2013-05-31 14:13:51 +02:00
Dhruti Shastri (OpenERP) dfe1a7ca34 [hr_hlidays] : Calender view display False value if no user_id 
bzr revid: dhs@tinyerp.com-20130531120453-56m4n4h4bxrca2x5
 2013-05-31 17:34:53 +05:30
Pinakin Nayi (OpenERP) b430036c7f [FIX]crm : delete with super user to avoid access rules because if there is any user (not have delete access of lead) than also merge opportunity 
bzr revid: pna@tinyerp.com-20130531114716-5as9flbu2506reh0
 2013-05-31 17:17:16 +05:30
Quentin (OpenERP) 03d39c5429 [IMP/FIX] report, trml2pdf: added the support of registerFontFamily tag to allow the mapping of different fonts for bold, italic or boldItalic 
bzr revid: qdp-launchpad@openerp.com-20130531114612-ofcn1swt5o5cc7oc
 2013-05-31 13:46:12 +02:00
niv-openerp 3a3841aabe [FIX] im: do not send empty messages 
bzr revid: nicolas.vanhoren@openerp.com-20130531111317-h17qwsevk06bhf84
 2013-05-31 13:13:17 +02:00
Jignesh Rathod (OpenERP) 18775366ff [MERGE]Trunk. 
bzr revid: jir@tinyerp.com-20130527120241-xbg2px1ykswsx521
bzr revid: jir@tinyerp.com-20130531104339-akdwmtw3w02clwqh
 2013-05-31 16:13:39 +05:30
Thibault Delavallée 71df2e6f7d [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130531101916-81xwtv4t58krnfaw
 2013-05-31 12:19:16 +02:00
niv-openerp c30d90e97a [FIX] desperate attempt to solve long polling process freezing 
bzr revid: nicolas.vanhoren@openerp.com-20130531095439-leao1mq9p0kvjqaw
 2013-05-31 11:54:39 +02:00
Thibault Delavallée 87ca825ae1 [IMP] auth_signup: now manage assertionerror, especially when having a login / email that is not valid. 
bzr revid: tde@openerp.com-20130531092606-q2gwhtd8j2lva3yo
 2013-05-31 11:26:06 +02:00
Thibault Delavallée 7a2179c99f [IMP] ir_mail_server: cleaned a message by adding some uppercases. 
bzr revid: tde@openerp.com-20130531092528-cuna42qie8volvou
 2013-05-31 11:25:28 +02:00
Thibault Delavallée 181a6b9430 [IMP] res_users: simplified form view: added placeholders, especially for login that should be an email. 
bzr revid: tde@openerp.com-20130531092511-41jfskbqo3v4oh4n
 2013-05-31 11:25:11 +02:00
Dharti Ratani (Open ERP) 2d51566f66 [FIX]Hide the margin in SO if you see SO as a customer through portal, if 'Display margin on sale orders' is activated 
bzr revid: dhr@tinyerp.com-20130531092311-rgtlbv55ai4223pk
 2013-05-31 14:53:11 +05:30
Olivier Dony 4045f8c9a5 [MERGE] project: wrong FK used in implementation of project.search(), courtesy of Nicolas Bessi (Camptocamp) 
lp bug: https://launchpad.net/bugs/1186146 fixed

bzr revid: odo@openerp.com-20130531091150-4cs6p4w3ced3dist
 2013-05-31 11:11:50 +02:00
Thibault Delavallée 7b320464ff [REV] users: contraints on login = email style not applicable anymore. 
bzr revid: tde@openerp.com-20130531082016-zx2lz6lhz4i4c7wt
 2013-05-31 10:20:16 +02:00
Thibault Delavallée 650cc6b281 [REV] users: constraint on login email-style not applicable anymore. 
bzr revid: tde@openerp.com-20130531082003-z9s1vvt7hc8c388d
 2013-05-31 10:20:03 +02:00
Thibault Delavallée 99e3996514 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130531081023-i483jfsiihsmf8yo
 2013-05-31 10:10:23 +02:00
Thibault Delavallée 8205a2d113 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130531081018-dzm2w9p08hakm04q
 2013-05-31 10:10:18 +02:00
Quentin (OpenERP) 40ea4556de [FIX] base, res_company: typo in default paraStyle tagname 
bzr revid: qdp-launchpad@openerp.com-20130531074745-ycfvlzrvlkrli33h
 2013-05-31 09:47:45 +02:00
nicolas.bessi@camptocamp.com c3f7fbbf1f [FIX] project name search if aa id != project id 
lp bug: https://launchpad.net/bugs/1186146 fixed

bzr revid: nicolas.bessi@camptocamp.com-20130531073631-dthwxiyp8mnmtkfr
 2013-05-31 09:36:31 +02:00
Martin Trigaux c40010d9a3 [IMP] event: remove unused parameter from context added at revision 8737 
bzr revid: mat@openerp.com-20130531073028-mtal4bgzx2f57yne
 2013-05-31 09:30:28 +02:00
Launchpad Translations on behalf of openerp ddc7e6c994 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
 2013-05-31 07:01:07 +00:00
Launchpad Translations on behalf of openerp 3892f2012e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070010-d94zj275obvxgnow
 2013-05-31 07:00:10 +00:00
Pinakin Nayi (OpenERP) de5b79545e [FIX]account : account invoice balance is double the total 
bzr revid: pna@tinyerp.com-20130531062946-i0rhy98n8bjk9nh4
 2013-05-31 11:59:46 +05:30
Paramjit Singh Sahota 2d5d0b116d [MERGE] Merged lp:openobject-addons. 
bzr revid: psa@tinyerp.com-20130531054741-r32kszp0mqvw474x
 2013-05-31 11:17:41 +05:30
Paramjit Singh Sahota 327224d80a [IMP] Added a new action for the res_partner forms Issues buttons to pass only the partner_id and not used the existing bcz itz passing the project_id which is not needed in res_partner's form view 
And changes the sequence of buttons

bzr revid: psa@tinyerp.com-20130531054602-c3c8jnt8dhvut6w7
 2013-05-31 11:16:02 +05:30
Launchpad Translations on behalf of openerp d9a24a551f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531053826-kecibs4xe8osg8kr
 2013-05-31 05:38:26 +00:00
Olivier Dony 5507cab76f [MERGE] crm: partner merge wizard: safer behavior when merging + allow choice of target partner + leave note in partner history after merge 
bzr revid: odo@openerp.com-20130530162721-5urwbdyfh68canf2
 2013-05-30 18:27:21 +02:00
Christophe Simonis 185f7552fd [FIX] multicorn: WorkerLongPolling watch for parent change 
[IMP] multicorn: WorkerLongPolling log into logger
[IMP] multicorn: Workers closes unwanted sockets

bzr revid: chs@openerp.com-20130530154537-89qrbgi5q1n6fgmh
 2013-05-30 17:45:37 +02:00
Olivier Dony 5b18695c45 [FIX] portal_hr_employee: force inherit_id to False to avoid errors during migrations 
The view has been converted to a first-class view
but was an inherited view before, so existing
database will exhibit issues when updating unless
the inherit_id field is forced to NULL.

Also fixed a minor typo.

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

bzr revid: odo@openerp.com-20130530151255-6kx6l91mwwa4tfei
 2013-05-30 17:12:55 +02:00
Martin Trigaux 49b693e30b [IMP] event: remove unused parameter from context 
bzr revid: mat@openerp.com-20130530150621-z4xsss7hfx7v8ixe
 2013-05-30 17:06:21 +02:00