Commit Graph
70704 Commits
Author SHA1 Message Date
Sbh (Openerp) 7d9cab896e [MERGE] Merge with lp:openobject-server
bzr revid: sbh@tinyerp.com-20120323064037-belgc637ugambnnw
2012-03-23 12:10:37 +05:30
Sbh (Openerp) 0360cb283a [IMP] purchase: Improve report
bzr revid: sbh@tinyerp.com-20120323062920-q0qrszoskdecmhjy
2012-03-23 11:59:20 +05:30
Mayur Maheshwari (OpenERP) b36ba932c9 [IMP]stock: Improved label string for translation
bzr revid: mma@tinyerp.com-20120323054403-9fikf2fjkp97npt2
2012-03-23 11:14:03 +05:30
Sbh (Openerp) e17dee3a5e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
2012-03-23 10:55:30 +05:30
Stuart Longland 5c4dba40f7 resource: Convert working hours to UTC
Faces assumes that all times are given in the same timezone.  OpenERP
uses UTC internally, and uses UTC when communicating task and project
start/end times to faces.

It unfortunately gives the working hours in local time.  The following
converts the time zone to UTC, assuming that the working hours are in
the time zone of the currently logged-in user.  (This will have to be
fixed to convert each resources' calendar from the resource's local time
zone to UTC.)

bzr revid: me@vk4msl.yi.org-20120323052250-m03bth2dy755hw1p
2012-03-23 15:22:50 +10:00
Stuart Longland 28c4e5530f faces: Fix 24-hour and end-at-midnight timespans
In cases where a working day either:
- Spans 24 hours
or
- ends at midnight
  
the time span calculation code incorrectly calculates the time of that
day, either stating that the day is 0 minutes long, or worse, is
negative.
  
The following patch addresses this.  Non-working days are specified
using the Python 'None', or 'False' values, rather than specifying the
same start and end time, as the latter will now be interpreted as a
24-hour period.

bzr revid: me@vk4msl.yi.org-20120323052146-vosvz50lg12n7e1i
2012-03-23 15:21:46 +10:00
Jagdish Panchal (Open ERP) 56def7cc2d [IMP] Project: rename menu Tasks ==> GTD
bzr revid: jap@tinyerp.com-20120323051515-wcvdcffivbpvotut
2012-03-23 10:45:15 +05:30
Launchpad Translations on behalf of openerp c3229cb8ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323051329-vecz1zbjb6gd776p
2012-03-23 05:13:29 +00:00
Amit Patel (OpenERP) 3dbea7ec59 [IMP]
bzr revid: apa@tinyerp.com-20120323045555-qab1wjnq4dbymwbq
2012-03-23 10:25:55 +05:30
Amit Patel (OpenERP) 3a00396aec [MERGE]
bzr revid: apa@tinyerp.com-20120323044556-vwvzgrypl3tx0lje
2012-03-23 10:15:56 +05:30
Launchpad Translations on behalf of openerp 1ba39859e2 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323044103-1pzlp21u7d512krs
2012-03-23 04:41:03 +00:00
Fabien Meghazi d4ec427f01 [FIX] Fixed css
bzr revid: fme@openerp.com-20120322204634-8o3o81oton9a4fqj
2012-03-22 21:46:34 +01:00
Quentin (OpenERP) 343158f39f [MERGE] merged the branch with menu modifications
bzr revid: qdp-launchpad@openerp.com-20120322172305-ko3l5j363lhdozkw
2012-03-22 18:23:05 +01:00
Quentin (OpenERP) 513b3c5108 [MERGE] merged the branch with modifications in menu
bzr revid: qdp-launchpad@openerp.com-20120322170200-6wk454ubjss2jij3
2012-03-22 18:02:00 +01:00
Vo Minh Thu 2c56c6fd4b [FIX] ir_property: type (missing comma in dict).
bzr revid: vmt@openerp.com-20120322165837-9onm0e3o4rm3zc6u
2012-03-22 17:58:37 +01:00
Thibault Delavallée 62843381c7 [MERGE] Merged with branch cleaning the thread widget
bzr revid: tde@openerp.com-20120322164750-k12lj70qq9oew2gq
2012-03-22 17:47:50 +01:00
Thibault Delavallée 434b61e8a3 [MERGE] Merged branch holding a cleaning of mail.thread module
bzr revid: tde@openerp.com-20120322164644-p8y3hitw013zbtrm
2012-03-22 17:46:44 +01:00
Vo Minh Thu 05422654b6 [IMP+FIX] fields: removed references to one2one, but also
corrected some typo `.. in (xxx)` instead of `.. in (xxx,)` (Note the trailing comma).
There is still a (non-harmful) reference to one2one in the base_synchro addons.

bzr revid: vmt@openerp.com-20120322164540-9rl8iidj4wrjohru
2012-03-22 17:45:40 +01:00
Vo Minh Thu 46a190aaf8 [IMP] fields: removed any reference to integer_big.
bzr revid: vmt@openerp.com-20120322163850-sxfd9g1x96jstr51
2012-03-22 17:38:50 +01:00
Thibault Delavallée 99fc46c5e5 [MERGE] Merged hr_holidays
bzr revid: tde@openerp.com-20120322163549-re9k1lkaoiayszvs
2012-03-22 17:35:49 +01:00
Thibault Delavallée 6652baba0c [IMP] Checks threads have new messages when initializing; TODO: code cleaning ...
bzr revid: tde@openerp.com-20120322163224-svqkt5g41w6jf3zv
2012-03-22 17:32:24 +01:00
Vo Minh Thu c5ef5e1394 [IMP] fields: removed deprecated fields (time, integer_big, one2one).
bzr revid: vmt@openerp.com-20120322161825-dlbnj9p2xe0mhhxx
2012-03-22 17:18:25 +01:00
Olivier Dony 9f8e297531 [IMP] modules.loading: lint cleanup
bzr revid: odo@openerp.com-20120322160806-y3g18dwn2z2xyuh2
2012-03-22 17:08:06 +01:00
Olivier Dony 5dc5c0814d [IMP] module: add a warning when uninstalling a module, as we will now delete data!
bzr revid: odo@openerp.com-20120322160123-jwukwtb7l5vp8hw4
2012-03-22 17:01:23 +01:00
Raphael Collet 5534020e3e [FIX] purchase: add default value for required field in config wizard
bzr revid: rco@openerp.com-20120322155913-lsykkvg59j2zc6my
2012-03-22 16:59:13 +01:00
Raphael Collet 77117e046d [IMP] mrp: change xml id of usability groups
bzr revid: rco@openerp.com-20120322155244-4pbdhs0ltzf98ub1
2012-03-22 16:52:44 +01:00
Raphael Collet d23ddb0676 [IMP] mrp.config: improve code and views
bzr revid: rco@openerp.com-20120322155027-dotn5e15ca97j4ur
2012-03-22 16:50:27 +01:00
Raphael Collet f65d238493 [MERGE] branch trunk-v62_manufacturing_config-tpa (new mrp config wizard)
bzr revid: rco@openerp.com-20120322154025-urygjfhneyc1h2i7
2012-03-22 16:40:25 +01:00
Raphael Collet d2ab548c8e [IMP] purchase, sale, stock: improve views of config wizards
bzr revid: rco@openerp.com-20120322153039-7m0g07odd2s3ljj1
2012-03-22 16:30:39 +01:00
Raphael Collet 7205e2e096 [FIX] stock: misconfigured xml ids
bzr revid: rco@openerp.com-20120322152755-i9ihcm3iac3eyne0
2012-03-22 16:27:55 +01:00
Raphael Collet 5fad916d37 [IMP] stock.config.settings: improve form view
bzr revid: rco@openerp.com-20120322151345-c5x5n7hwbhvn6brj
2012-03-22 16:13:45 +01:00
Raphael Collet a3ec0326df [FIX] purchase: fix test to use the new config wizard
bzr revid: rco@openerp.com-20120322150826-erw9hn9kd357l41k
2012-03-22 16:08:26 +01:00
Thibault Delavallée ab5a577438 [IMP] Indentation problem
bzr revid: tde@openerp.com-20120322150804-0azu6vu6e4afsiue
2012-03-22 16:08:04 +01:00
Olivier Dony aa29b8b1e8 [MERGE] Latest trunk
bzr revid: odo@openerp.com-20120322150602-ljmp97npef2lby00
2012-03-22 16:06:02 +01:00
Raphael Collet 1278fdb069 [IMP] stock.config: rename usability groups as part of module stock
bzr revid: rco@openerp.com-20120322150511-luwd99vtm4v4pmdr
2012-03-22 16:05:11 +01:00
Olivier Dony 975c65860f [MERGE] Latest bugfixes from 6.1
bzr revid: odo@openerp.com-20120322150506-vo7r1k65phlotaa2
2012-03-22 16:05:06 +01:00
Thibault Delavallée bf879014b7 [IMP] Better code indentation; added a forgotten field; reset group to the good one.
bzr revid: tde@openerp.com-20120322145727-hknudtr5t82ds832
2012-03-22 15:57:27 +01:00
Raphael Collet 456e227bdc [IMP] stock: rename config wizard as 'stock.config.settings'
bzr revid: rco@openerp.com-20120322145659-973ixl9f1b905bpw
2012-03-22 15:56:59 +01:00
Quentin (OpenERP) 28832dcd82 [FIX] account_voucher: computation of paid_amount_in_company_currency field
lp bug: https://launchpad.net/bugs/954155 fixed

bzr revid: qdp-launchpad@openerp.com-20120322145539-e4g01pi131vfobaw
2012-03-22 15:55:39 +01:00
Raphael Collet 3cc0131e0b [FIX] stock.config: add missing fields
bzr revid: rco@openerp.com-20120322145335-j5corrkzikjxnwb2
2012-03-22 15:53:35 +01:00
Raphael Collet 182f22fc75 [MERGE] branch trunk-v62_warehouse_config-tpa (new stock config wizard)
bzr revid: rco@openerp.com-20120322144357-2k9xpu7ct1i13dl4
2012-03-22 15:43:57 +01:00
Olivier Dony ee77b351b4 [MERGE] Latest fixes from 6.1
bzr revid: odo@openerp.com-20120322143654-w7etvdnq4z5tg6bt
2012-03-22 15:36:54 +01:00
Xavier Morel 7353e02e2e [MERGE] from trunk
bzr revid: xmo@openerp.com-20120322143331-iajlifomw1hohbht
2012-03-22 15:33:31 +01:00
Xavier Morel 514c63288c [FIX] change dataset.read_index to be implemented in terms of dataset.read_ids, not in terms of model.first() as not all model data is kept/transferred (filters are not bubbled?)
bzr revid: xmo@openerp.com-20120322142540-x3j9p7kub2px6p6v
2012-03-22 15:25:40 +01:00
RGA(OpenERP) 606e375540 [FIX] inherited view could not find 'date_create' which is remove from sale_order form view
bzr revid: rgaopenerp-20120322141949-oghbmf2v8y68m2bx
2012-03-22 19:49:49 +05:30
Rucha Patel b3f2abec46 [FIX] email_template: ensure non-empty context when rendering template'
bzr revid: odo@openerp.com-20120322141153-8u3kia3k125et6b5
2012-03-22 15:11:53 +01:00
Rucha Patel cbef5ce396 [FIX] email_template: don't re-encode attachments copied from template'
bzr revid: odo@openerp.com-20120322141104-rw5i4dedy01wjmjf
2012-03-22 15:11:04 +01:00
Roberto López López (OpenERP) 337fe0c8ee [fix]
bzr revid: rlo@openerp.com-20120322140814-mvo7e1qh4svom3tw
2012-03-22 15:08:14 +01:00
Jagdish Panchal (Open ERP) 409a041c1f [IMP] Account: change sequence of menus and apply the group_no_one
bzr revid: jap@tinyerp.com-20120322134657-jxu71v2ebd2o2igo
2012-03-22 19:16:57 +05:30
Minh Tran 64bb386f65 Changed the layout to only have 1 scrollbar on the right
bzr revid: mit@openerp.com-20120322133544-g0codu01ahygaii6
2012-03-22 14:35:44 +01:00