772b213e69
[FIX] hr_timesheet_sheet: hide button "Add a Line" if readonly sheet
...
The 'Add a line' button should be hidden when the sheet is readonly.
For instance, for a submitted employee sheet.
closes #4297
opw-628160
2015-02-17 10:56:14 +01:00
08888b21b8
[MERGE] forward port of branch saas-3 up to 48f527b
2015-02-10 15:32:20 +01:00
48f527b860
[MERGE] forward port of branch 7.0 up to 368c674
2015-02-10 15:31:51 +01:00
c718661ba8
[FIX] hr_timesheet_sheet: default product in analytic lines
...
The module analytic_user_function allows to define a specific product
to use, when creating timesheet activities for a specific employee
with a specific contract
Nevertheless, the product was not set accordingly to this feature
for the first timesheet activity, because,
when initilialing the timesheet line,
the on_change_account_id, which returns
the product to use according to the user and contract, was called
without passing the user.
Besides, by default, on_change_account_id does not have a user_id parameter,
this parameter is added by the module analytic_user_function, overriding
this onchange, and adding a new user_id parameter (which is not a good pratice).
We therefore use multi_on_change_account_id, which allow to pass the user_id,
within the context
2015-02-10 11:54:55 +01:00
1d7120a978
[FIX] hr_timesheet_sheet: prevent modify activities of confirmed sheets
...
In 7.0, prevent changes in activities of validated sheets was done thanks to the constraint
_check_sheet_state.
In 7.0, python constraints were checked at each write operations
whatever if the fields on which the constraint is were altered or not
This is no longer the case in Odoo 8.0: The constraint is checked
only if the fields on which the constraint is are altered.
As this specific constraint must be applied anytime, whatever the altered fields,
we now do this constraint check in the "write" method.
Besides, it was already the case for the unlink method.
opw-627415
2015-02-09 12:30:28 +01:00
eaa32e51dd
[MERGE] forward port of branch saas-3 up to 9003537
2015-02-09 12:19:36 +01:00
9003537222
[MERGE] forward port of branch 7.0 up to dd9d8b0
2015-02-09 12:14:09 +01:00
dd9d8b0c84
[FIX] hr_timesheet_sheet: prevent new activity on confirmed sheets
...
Once a timesheet confirmed, the activity hours should not be modified,
for any reasons.
The constraint _check_sheet_state prevents to modify activities
for confirmed timesheets, but does not prevent the addition
of new activities within the current, but confirmed, timesheet.
opw-627415
fixes #5128
2015-02-09 12:13:17 +01:00
8e03852fd4
[I18N] Update translations from Launchpad 8.0 branches
2015-01-26 16:36:51 +01:00
39f00b3637
[I18N] Update translation templates with latest terms
...
Total new terms: 270
Total deleted terms: 82
Total identical terms: 19653
Old total number of terms: 19735
New total number of terms: 19923
2015-01-21 15:31:22 +01:00
a472c4cfc9
[FIX] hr_timesheet_sheet: chatter display bug. Fix #4707
2015-01-16 11:34:38 +01:00
ccb4e4332e
[FIX] hr_timesheet_sheet: prevent sheets overlaping
...
The constraint prevent sheets to overlap was broken because it relies on a check on the
user_id. The problem is that the latter uses an old-api function field
that is not recomputed yet at the time of the validation. The fix consists in
using a non-computed field instead.
This rev. is related to:
- 4fb9c8f0dc6c78541978Closes #4217
opw-620175
2015-01-14 13:35:38 +01:00
d0cd92bb9f
[I18N] Sync updated 7.0 translations from Launchpad
2015-01-07 17:57:28 +01:00
295dcfc480
[MERGE] forward port of branch saas-3 up to b2be001
2015-01-07 12:49:06 +01:00
b2be001257
[MERGE] forward port of branch 7.0 up to dbb2a66
2015-01-07 12:48:39 +01:00
dbb2a669f4
[FIX] hr_timesheet_sheet: display timesheet by day summary in employee tz
...
If an employee in UTC + 1 (Europe/Brussels) entered an attendance from January 2 00:00 to Januay 2 23:59, the summary by day table displayed two different lines, for two different days:
- 1 hour on January 1 from 23:00 to 23:59
- 22:59 hours on January 2 from 00:00 to 22:59
Which is obviously wrong, the employee, in its own time zone, worked on January 2 only.
2015-01-07 12:26:41 +01:00
ba37ae3cf3
[DEL] Cleaning: key 'images' removed from all __openerp__.py
2015-01-06 14:20:38 +01:00
a6d24db305
[I18N] Update translations from Launchpad 8.0 branches
2014-11-19 17:49:12 +01:00
ca209eb184
[FIX] hr_timesheet(_sheet): access rights on report
...
hr.timesheet.report was moved from hr_timesheet_sheet to hr_timesheet but not the ir.model.access
Avoid warning "The model hr.timesheet.report has no access rules, consider adding one."
Fixes #3319
2014-11-13 11:03:22 +01:00
c825d0552d
[MERGE] forward port of branch saas-3 up to ec27773
2014-11-05 21:46:42 +01:00
ec277732fe
[MERGE] forward port of branch 7.0 up to 3e3e35e
2014-11-05 21:10:15 +01:00
388732dfa6
[IMP] *: one Makefile to rules them all.
...
Create one unique generic Makefile to compile sass files.
2014-11-05 19:30:28 +01:00
7439421ad2
[I18N] Update translations from Launchpad 8.0 branches
2014-10-08 17:52:25 +02:00
b74d830eb2
[I18N] Update translation templates with latest term changes
2014-09-23 19:13:50 +02:00
1c5b5e4290
[I18N] Update translations from Launchpad 8.0 branches
...
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
29e08a272c
[MERGE] forward port of branch saas-3 up to 5bd0249
2014-09-18 16:18:23 +02:00
5bd0249515
[MERGE] forward port of branch 7.0 up to a218a9e
2014-09-18 16:05:34 +02:00
53aa92d3c9
[I18N] Update translations from Launchpad branches
2014-09-18 11:47:16 +02:00
16a969214f
[FIX] hr_timesheet_sheet: avoid error when sort attendances
...
When an attendance line is edited, the tuple has no key 'name' which lead to a traceback.
Fixes #546
2014-09-17 18:25:08 +02:00
fac96241df
[I18N] Update 8.0 translations with latest changes from Launchpad
2014-09-08 19:04:25 +02:00
8aca457e34
[IMP] Updated website urls on modules and info page
2014-08-26 21:40:18 +02:00
f57787e07e
[IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files)
2014-08-26 11:56:49 +02:00
5a5f811d23
[REVERT] commit 5e5c73e
...
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
5e5c73e7ba
[IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files)
2014-08-22 09:49:09 +02:00
50ef63881a
[I18N] Update 8.0 translation with latest source code
2014-08-14 17:01:54 +02:00
96c36e895c
[I18N] Update all 7.0 translation templates with latest terms and annotations
...
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
366a30db95
[FIX] correct various date issues in reporting
...
* remove old 'day', 'month', 'field' and replace them by the actual
date/datetime field
* remove weird cast to char when creating the view to prevent crash
when grouping on them
* remove duplicates (such as 'creation_date' and 'create_date')
* fix typing errors (field type date defined as a datetime in the
postgres view)
* fix search view definition
2014-07-30 15:11:22 +02:00
2398f480cd
[IMP] addons: add _depends on models backed up by an sql view and used by other models
2014-07-08 15:32:38 +02:00
a6b025d6d9
[FIX] models, fields: add model dependencies for models backed up by sql views
2014-07-08 10:16:16 +02:00
cbe2dbb672
[MERGE] new v8 api by rco
...
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +02:00
8dfd5eab01
[MERGE] forward port of branch saas-4 up to a4bc65c
2014-06-27 16:08:09 +02:00
a4bc65cdba
[MERGE] forward port of branch saas-3 up to bdc4dd4
2014-06-27 16:06:37 +02:00
bdc4dd4a65
[MERGE] forward port of branch 7.0 up to 95cff0b
2014-06-27 16:00:28 +02:00
9404ab4cfb
[FIX] hr_timesheet_sheet: accept custom fields in timesheets
...
When creating hr.analytic.timesheet do not filter the list of fields to accept but set the list of fields to remove.
2014-06-26 15:31:55 +02:00
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +02:00
d2f3bb953d
[IMP] move hr timesheet analysis report in to hr_timesheet
2014-06-17 13:53:33 +02:00
0f01df42ea
[MERGE] Forward-port saas-5 up to f15cbd6
2014-06-12 18:59:15 +02:00
f15cbd6520
[MERGE] Forward-port saas-4 bugfixes up to ad4c6ca
2014-06-12 18:54:36 +02:00
74168c4e9d
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
...
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
2014-06-12 16:27:11 +02:00
ad4c6caecf
[MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3
2014-06-12 13:52:35 +02:00
9f0ecb3572
[MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df
2014-06-12 13:49:32 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
8202561511
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-10 11:43:17 +02:00
905617b530
hr_timesheet_sheet: for attendance, set default value for employee_id in the context
2014-06-06 12:55:22 +02:00
e035cc9105
[FIX] hr_timesheet_sheet: fix typo in field name
2014-06-02 18:37:52 +02:00
555677f14d
[IMP] replace all 'Group By...' by 'Group By'
...
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters. This change was requested by the upper management
2014-05-22 11:44:35 +02:00
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
1953aa442f
[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
...
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
2014-05-07 17:33:48 +02:00
ad0ed2c4d8
[FIX] code cleanup (addon hr_timesheet_sheet)
...
remove try/except/statement that should not be here, uses search_count when appropriate, and remove a now useless one2many field
bzr revid: ged@openerp.com-20140507141725-h2z9u72roscf407n
2014-05-07 16:17:25 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
c1601e75d3
[FIX] sign in and sign out were broken in rev 10019 as it doesn't provide a date to conversion of attendance time to employee timezone
...
lp bug: https://launchpad.net/bugs/1314589 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140430113730-cn3xw66fbik8p32n
2014-04-30 13:37:30 +02:00
c3e812f34a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp.com-20140430102552-qkwv20b20nve64th
...
bzr revid: odo@openerp.com-20140430110048-6971xplq8k073tto
2014-04-30 13:00:48 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
79d4c57877
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
...
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
fdfcb6bf47
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
c393fbcddd
[MERGE] [FIX] hr_timesheet_sheet: make it timezone tolerant and avoid errors when comparing datetime and dates, courtesy of Yannick Vaucher (Camptocamp)
...
The attendance date recieved by the server is in UTC while the user sees it in his timezone. This means that an attendance could be in a timesheet (bounded by dates) for a user but not for the server which would not accept a valid attendance.
The fix will make the check in the user's timezone.
Only the date part of the attendance is kept for comparison as the boundaries are dates objects.
bzr revid: mat@openerp.com-20140428153216-4s6r5hu1ov0p0ofm
2014-04-29 01:32:16 +10:00
22d1c0956f
[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622
...
lp bug: https://launchpad.net/bugs/1313622 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140428142017-3warx1ai72cfetj1
2014-04-28 16:20:17 +02:00
886c827458
[UPD]
...
bzr revid: yannick.vaucher@camptocamp.com-20140428135535-o9512996d18cudgq
2014-04-28 15:55:35 +02:00
2832d2ddc9
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
...
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
bb85882322
[FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet (opw 592632)
...
bzr revid: mat@openerp.com-20140425100856-lcpgyjdk4u632bws
2014-04-25 12:08:56 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
34067a1f49
[FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet
...
lp bug: https://launchpad.net/bugs/1180769 fixed
bzr revid: mat@openerp.com-20140424142829-ramy830hwkghk1jv
2014-04-24 16:28:29 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
52cfc16c2e
[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
...
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
2014-04-24 14:35:38 +02:00
966a818aa6
[FIX] hr_timesheet_sheet: allow writing attendance line not according to the date order, and check that the attendances satisfy the alternance constraint, even for delete operations
...
lp bug: https://launchpad.net/bugs/1180773 fixed
bzr revid: dle@openerp.com-20140423112554-75bpk5k3viroqbh5
2014-04-23 13:25:54 +02:00
3a0c820dfd
[MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock)
...
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
2014-04-22 14:30:22 +02:00
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
b8d4387d33
[MERGE] merged with main addons branch
...
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
8135812d34
[FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*)
...
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
2014-04-15 12:54:19 +02:00
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
e1cebe9003
[REF] hr_timesheet: unused piece of code
...
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
91a5db808d
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
2014-04-14 13:53:54 +02:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
76840b36cb
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140331090709-y4bj3kqp5chq2zko
2014-03-31 14:37:09 +05:30
77ff3a69b8
[IMP] improve icons and views
...
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
457a62dee6
[IMP] add stat button for point of sale, email template
...
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
2014-03-27 17:07:20 +05:30
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
3897de56b7
[IMP]: Convert buttons into stat buttons in hr modules
...
bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
2014-03-26 17:30:56 +05:30
1f3c4f852f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +00:00
dd404cd701
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140319070736-oxjw6beks1fda6xn
2014-03-19 12:37:36 +05:30
Anthony Muschang
Denis Ledoux
Olivier Dony
Ronak Baxi
Aaron Bohy
Rucha Dave
Christophe Simonis
rmu-odoo
Fabien Pinckaers
qdc
Géry Debongnie
Raphael Collet
Martin Trigaux
Jaydeep Barot
tpa-odoo
Fabien Meghazi
Laetitia Gangloff
OstapYakovenko
Christophe Simonis
Gery Debongnie
Antony Lesuisse
Yannick Vaucher
Richard Mathot (OpenERP)
Denis Ledoux
Launchpad Translations on behalf of openerp
Bharat Devnani (Open ERP)
Darshan Kalola (OpenERP)
Randhir Mayatra rma-openerp
Chirag Dodiya (OpenERP)
Yogesh Parekh (OpenERP)