pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,704 Commits 1 Branch 0 Tags
724cbb6dee94de43343fa380c33ea9329647a759
Commit Graph
70704 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Devnani (OpenERP) bff36a479f [MERGE] merged with main addons 
bzr revid: bde@tinyerp.com-20121119062216-b9tuwmj8gfrrymrq
 2012-11-19 11:52:16 +05:30
Paramjit Singh Sahota 48deaf23df [IMP] Improved code for the 'Need Action' indicators highlightz with the infinity symbol when the records exceed 99. 
bzr revid: psa@tinyerp.com-20121119062151-0oj8w4k73cgy4hat
 2012-11-19 11:51:51 +05:30
Sanjay Gohel (Open ERP) 329352de5b [MERGE]merge with parent branch 
bzr revid: sgo@tinyerp.com-20121119055056-2vtvq7cqquncvx74
 2012-11-19 11:20:56 +05:30
RGA(OpenERP) 9edcf62112 Merge with turnk 
bzr revid: rgaopenerp-20121119054725-4bfc90t8eyre6xip
 2012-11-19 11:17:25 +05:30
Hiral Patel (OpenERP) 786b11f31d [MERGE] Merge with lp:openerp-web 
bzr revid: hip@tinyerp.com-20121119054316-24eeo5y3011z3z53
 2012-11-19 11:13:16 +05:30
RGA(OpenERP) c411144f5a Merge with trunk: 
bzr revid: rgaopenerp-20121119054311-9xdwk7ye4g9wr1kh
 2012-11-19 11:13:11 +05:30
Vijaykumar Baladaniya b9e79b21c9 [IMP] Update menu name and remove Human Resources menu. 
bzr revid: vba@tinyerp.com-20121119054246-16gvypp9hp4e8mhs
 2012-11-19 11:12:46 +05:30
Jiten (OpenERP) 4346af9c96 [MERGE] Merged trunk. 
bzr revid: jra@tinyerp.com-20121119054138-lkrx5jo1tgbr71ek
 2012-11-19 11:11:38 +05:30
Jiten (OpenERP) df184ad1f9 [MERGE] Merge trunk. 
bzr revid: jra@tinyerp.com-20121119053320-to7uhn8mk3xpvq8r
 2012-11-19 11:03:20 +05:30
Launchpad Translations on behalf of openerp 66afff1b52 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121117043708-z0u57016sd0wlp40
bzr revid: launchpad_translations_on_behalf_of_openerp-20121118043740-7rflvcr80m8nk6lf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121119043743-wa4nnbhzv39ixzag
 2012-11-19 04:37:43 +00:00
Launchpad Translations on behalf of openerp caa54bb76f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121119043724-mjkn4taco62obn62
 2012-11-19 04:37:24 +00:00
dusan 0f37e0aed5 [MERGE] with parent 
bzr revid: dusan@ubuntu-20121118191307-1o9rif9nzcp48ryf
 2012-11-18 20:13:07 +01:00
Launchpad Translations on behalf of openerp 37209eb5e7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121118044730-4j5223ylkxl9o332
 2012-11-18 04:47:30 +00:00
Sebastien LANGE 516ac4b80f [FIX]stock_partial.picking: rounding issue with same or different uom in partial picking wizard 
bzr revid: sebastien.lange@syleam.fr-20121117212013-epxlgv0yyn61i5gy
 2012-11-17 22:20:13 +01:00
Sebastien LANGE c250930b02 [FIX] tax in invoice is not calculated automatically while invoice created from sale order 
bzr revid: sebastien.lange@syleam.fr-20121117203858-7yx8fu3kk7plvk42
 2012-11-17 21:38:58 +01:00
Christophe Simonis 4aa5e76174 merge upstream 
bzr revid: chs@openerp.com-20121116183212-1ke59kde4ilicw6d
 2012-11-16 19:32:12 +01:00
dusan d1a874ebd7 [MERGE] merge with parent 
bzr revid: dusan@ubuntu-20121116174713-rrcta3h4ktr0pqui
 2012-11-16 18:47:13 +01:00
Thibault Delavallée 618829ccd9 [FIX] mail_demo: fixed attachment_ids. 
bzr revid: tde@openerp.com-20121116171541-3rbe6kq04maa1z7e
 2012-11-16 18:15:41 +01:00
Thibault Delavallée 5747c6fddc [HACK] Temp hack about reloading menus. 
bzr revid: tde@openerp.com-20121116171100-h2to6ij4p5idcui9
 2012-11-16 18:11:00 +01:00
Olivier Dony 62c64d5c4d [IMP] sale_portal: override default Send by Email templates to include portal signup link 
bzr revid: odo@openerp.com-20121116170643-usandzkdhi0idn2d
 2012-11-16 18:06:43 +01:00
Olivier Dony 01df612cd9 [FIX] mail.compose.wizard: attachments should be m2m, body_text and content_subtype obsolete and removed 
bzr revid: odo@openerp.com-20121116170503-mvsaa0pv5py2b7ri
 2012-11-16 18:05:03 +01:00
Olivier Dony 1829317730 [IMP] typo: uniform naming of Send By Email 
bzr revid: odo@openerp.com-20121116170330-tzz613767wnayzsr
 2012-11-16 18:03:30 +01:00
Olivier Dony e5374b93b4 [REF] email_template: cleanup/remove obsolete fields on mail composition wizard: use_template is the default 
bzr revid: odo@openerp.com-20121116170259-08eot6wy40yehkh4
 2012-11-16 18:02:59 +01:00
Xavier Morel 86842fe9c8 [FIX] correctly handle case of deleting-an-o2m-line-being-edited 
move special case in o2m listview to main editable and expand to
correctly fit edition cases, not just work in case of creation

issue: if a row being edited is deleted in an o2m, the form will be
blurred and try cancelling/saving the edition and reloading the row,
but this will only happen *after* the record/row/whatever has been
"deleted" and (amongst other things) removed from the buffered o2m
cache, leading to a tentative read on the server side (usually with a
local id which doesn't even make sense) and thus an error.

Intercept the deletion signal to cancel the edition immediately and
only let the deletion through after the edition has successfully been
canceled.

bzr revid: xmo@openerp.com-20121116164416-8kr39t6jtqy2s3jc
 2012-11-16 17:44:16 +01:00
Xavier ALT aba5f1d153 [MERGE] OPW 576495: stock: fix missing 'state' field in view - required for button states evaluation 
bzr revid: xal@openerp.com-20121116164329-p07c6snecd0h9j6n
 2012-11-16 17:43:29 +01:00
Christophe Simonis 4a454397f8 [IMP] auth_oauth: redirect directly to controller; do not make heuristic on arguments 
bzr revid: chs@openerp.com-20121116162421-5yahj18n88yykq2k
 2012-11-16 17:24:21 +01:00
Olivier Dony 07677b361e [IMP] type: uniform naming of Send By Email 
bzr revid: odo@openerp.com-20121116161638-rjv0mqa9f2fonxx0
 2012-11-16 17:16:38 +01:00
Olivier Dony ac7e2607ff [IMP] auth_signup: allow passing more options to signup URL 
bzr revid: odo@openerp.com-20121116161554-9laa2orf0l9kl5ju
 2012-11-16 17:15:54 +01:00
Josse Colpaert 5f6255c970 [IMP] kanban view, greys, first tab context 
bzr revid: jco@openerp.com-20121116161437-pdjig82ybpxda184
 2012-11-16 17:14:37 +01:00
Christophe Matthieu a4f119b3a2 [IMP] mail follower: hide subtype list if they are only one subtype. Unfollow if the user unfollow all subtype. 
bzr revid: chm@openerp.com-20121116160128-ffga2ffy3ldmps4b
 2012-11-16 17:01:28 +01:00
Xavier ALT 933a67b2bc [MERGE] OPW 576829: pos: fix creation of payment line when pos order have multiple payment methods + return 
partial trunk backport revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l,
				 odo@openerp.com-20121105111609-yuaw6wu6jd1ar2a1

bzr revid: xal@openerp.com-20121116153508-tkill5ov1f3ar75s
 2012-11-16 16:35:08 +01:00
Thibault Delavallée 61835e0080 [IMP] mail, crm: improved demo data. 
bzr revid: tde@openerp.com-20121116153141-n8nxkg6g8uypex1a
 2012-11-16 16:31:41 +01:00
Thibault Delavallée 3d2bfc8981 [FIX] crm: still fixing filters about base action rule. 
bzr revid: tde@openerp.com-20121116153130-p064sro5923dhh3h
 2012-11-16 16:31:30 +01:00
Thibault Delavallée 979bf581a8 [FIX] action_rule: fixed some filters to be with user_id False, ot be available to every employee. 
bzr revid: tde@openerp.com-20121116153101-ta18d6mzeg70avcd
 2012-11-16 16:31:01 +01:00
Xavier ALT d1ae672219 [FIX] pos: fix order creation from ui having multi payment method + returns 
bzr revid: xal@openerp.com-20121116151509-04l15a66370rqx8h
 2012-11-16 16:15:09 +01:00
Christophe Matthieu ea92f73acc [MERGE] from trunk-mail-uploader-chm 
bzr revid: chm@openerp.com-20121116151506-z0qg8cgf069kdato
 2012-11-16 16:15:06 +01:00
niv-openerp 40c4ed7f54 [FIX] problem in editable list o2m when hitting the enter button rapidly 
bzr revid: nicolas.vanhoren@openerp.com-20121116151248-il59eiekk758suco
 2012-11-16 16:12:48 +01:00
Christophe Matthieu 8ccbab8254 [MERGE] from trunk-mail-uploader-chm 
bzr revid: chm@openerp.com-20121116151115-1u69yio8kb1h8fjd
 2012-11-16 16:11:15 +01:00
Christophe Matthieu ae25dc380f [IMP] mail: remove test for attachment with one2many 
bzr revid: chm@openerp.com-20121116150850-zpaeci0wbx725pix
 2012-11-16 16:08:50 +01:00
Raphael Collet f2bc7b8f4d [IMP] web.http: factor out session path generation 
bzr revid: rco@openerp.com-20121116150131-a2ioomezc62kqgrb
 2012-11-16 16:01:31 +01:00
vta vta@openerp.com 20a50a1866 [FIX] Fixed portal_crm module structure and test. Improved code to invite sale order followers to follow the invoice object. 
bzr revid: vta@openerp.com-20121116145407-6hbv0xboq3igvt0l
 2012-11-16 15:54:07 +01:00
Vo Minh Thu 01b9f4c3ed [MERGE] removed a few warnings. 
bzr revid: vmt@openerp.com-20121116141517-1dwjs27cwk2nq9t4
 2012-11-16 15:15:17 +01:00
Vo Minh Thu eafc8fb4d3 [MERGE] removed a few warnings. 
bzr revid: vmt@openerp.com-20121116141502-v1z8w86o0bczgsk3
 2012-11-16 15:15:02 +01:00
Antony Lesuisse bcfa7c49cc [IMP] minify cache 
bzr revid: al@openerp.com-20121116135822-xduk3jnvuhvtorll
 2012-11-16 14:58:22 +01:00
Vo Minh Thu 8c32318152 [IMP] base_status: removed unneeded date_open field from call to crm.claim.create(). 
bzr revid: vmt@openerp.com-20121116135144-talk5y0owm848mj7
 2012-11-16 14:51:44 +01:00
Olivier Dony b9525453a9 [FIX] base_gengo: remove sandbox flag, improve inconsistent labels on gengo wizard, cleanup, better error reporting 
bzr revid: odo@openerp.com-20121116135021-jxz6u76wqyersykl
 2012-11-16 14:50:21 +01:00
Vishmita 367e3a90cc [FIX]add accesskey for 'add items'. 
bzr revid: vja@tinyerp.com-20121116133111-joo7ghrvrlqs0f0v
 2012-11-16 19:01:11 +05:30
Nimesh (Open ERP) 65cd11f10d [FIX] fix the worng invoice amount. 
bzr revid: nco@tinyerp.com-20121116132055-sfyjk47onvxl8wle
 2012-11-16 18:50:55 +05:30
Vo Minh Thu 35ec3e6d5b [IMP] test_limits/test_uninstall: added access rules. 
bzr revid: vmt@openerp.com-20121116131439-y14dekyogidxymof
 2012-11-16 14:14:39 +01:00
Christophe Matthieu 81db3f3997 [IMP] mail: commented test for res_model on attachment because one2many became many2many 
bzr revid: chm@openerp.com-20121116130834-hsu7wunja092ayt9
 2012-11-16 14:08:34 +01:00