pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,162 Commits 1 Branch 0 Tags
bb0decba675291c18fb2aa44d9c7c8da320080a8
Commit Graph
27162 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mtr bb0decba67 [IMP] hr_payroll:commented the line_ids field(hr.payroll.structure) and function_id field(hr.payslip.line) 
bzr revid: mtr@mtr-20110302071238-s3efwfa486q0ylht
 2011-03-02 12:42:38 +05:30
mtr 017c72127b [IMP] hr_payroll:improved demo data and the structure of 'Salary Head' 
bzr revid: mtr@mtr-20110301132938-rt8nqcwndgj0gefp
 2011-03-01 18:59:38 +05:30
mtr 4248ad01a2 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll 
bzr revid: mtr@mtr-20110301122016-1n5aw2893mkujtpl
 2011-03-01 17:50:16 +05:30
mtr 821705ed00 [IMP] hr_payroll:improved the tree view of Salary Rules on Salary structure 
bzr revid: mtr@mtr-20110301121815-3gpaoa5hm6wc6o06
 2011-03-01 17:48:15 +05:30
Mustufa Rangwala d01712fa0d [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110301121252-69u03futyrdjzelg
 2011-03-01 17:42:52 +05:30
mtr a9b46f9eb8 [IMP] hr_payroll:removed commented(#) obj company.contribution 
bzr revid: mtr@mtr-20110301113852-fpv8uk4fst2ducvs
 2011-03-01 17:08:52 +05:30
Thibault Francois 9da7e92f30 [MERGE] bug fix 722579 
bzr revid: tfr@openerp.com-20110301113415-cblv1h29s8ug3z79
 2011-03-01 12:34:15 +01:00
mtr 73bbece660 [IMP] hr_payroll:removed Function from salary rules,modified the hr.holiday.status 
bzr revid: mtr@mtr-20110301112908-agdcje98pb5hrgx2
 2011-03-01 16:59:08 +05:30
mtr 5778a97065 [IMP] hr_payroll:removed company contribution object and merged it with salry rules 
bzr revid: mtr@mtr-20110301095910-y1qhf82zms1lubrs
 2011-03-01 15:29:10 +05:30
Launchpad Translations on behalf of openerp 9c7afeb2c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301043841-ufga2xxsn0e0jxpz
 2011-03-01 04:38:41 +00:00
Olivier Dony 4017c9da74 [MERGE] merged multi-company rules fix from 6.0 
bzr revid: odo@openerp.com-20110228104936-7o281husy5j1hz8l
bzr revid: odo@openerp.com-20110228140001-eo18g7ncst04v0lg
 2011-02-28 15:00:01 +01:00
Olivier Dony beac68b7d2 [REVERT] all: revert incorrect change of default ir.rules for multi-company 
By default only records belonging to the user's company or descendant companies
should be visible. The original patch introduced visibility of records
from ancestor companies, which should be suited only for a few cases, such
as res.patner.
Original revision: 3164.24.175  sbh@tinyerp.com-20101223095216-n6psmzicdcs8is8x

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

bzr revid: odo@openerp.com-20110228135754-6skiy4fb9dg54xb6
 2011-02-28 14:57:54 +01:00
Jay Vora (OpenERP) f4faceac9c [MERGE] Merged the branch of Dhruti for the fix of a case 
bzr revid: jvo@tinyerp.com-20110228110655-19ei6pq9odgl54ic
 2011-02-28 16:36:55 +05:30
Quentin (OpenERP) 8798384504 [IMP] hr_payroll: some clearance 
bzr revid: qdp-launchpad@openerp.com-20110228105524-tymoxmlzi81dksz2
 2011-02-28 11:55:24 +01:00
Quentin THEURET 7086606211 [FIX] product: name_search should give precedence to product code only on exact match 
lp bug: https://launchpad.net/bugs/726415 fixed

bzr revid: odo@openerp.com-20110228102843-j85u4gmknxsni66y
 2011-02-28 11:28:43 +01:00
Quentin THEURET 2bf57273d0 [FIX] product: name_search should give precedence to product code only on exact match 
bzr revid: odo@openerp.com-20110228102555-ey1jjghta17fiua2
 2011-02-28 11:25:55 +01:00
Quentin (OpenERP) 91f14201bf [IMP] hr_payroll: renamed struct_id field of hr.payroll.structure into parent_id 
bzr revid: qdp-launchpad@openerp.com-20110228095643-rji364bszjfq2a60
 2011-02-28 10:56:43 +01:00
Quentin THEURET 00f0b7d9af [FIX] Fix the name_search method of product_product 
lp bug: https://launchpad.net/bugs/726415 fixed

bzr revid: quentin@tempo-quentin-20110228093450-pffa9txsgza5eamm
 2011-02-28 10:34:50 +01:00
Vo Minh Thu 957f2418d4 [MERGE] act_window access: corrected the access for normal users to read-only. 
lp bug: https://launchpad.net/bugs/720277 fixed

bzr revid: vmt@openerp.com-20110228093014-a0p7n0tqpzifef4j
 2011-02-28 10:30:14 +01:00
Vo Minh Thu 4569d7856e [MERGE] from the 6.0 branch 
bzr revid: vmt@openerp.com-20110228090850-g127ghkht08s60tu
 2011-02-28 10:08:50 +01:00
DHS (OpenERP) ded318bef1 [FIX] Account : Invoice line should contain the product description in notes (Ref : Case 4298) 
bzr revid: dhs@tinyerp.com-20110228063659-e6q8jou2kcyg9on2
 2011-02-28 12:06:59 +05:30
Launchpad Translations on behalf of openerp 08315fe28a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110226063924-7y7o7zjyjtzm2xxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110227062306-oeu1yf1d9p4a42e6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110228055407-fo5auo95u3p0ifn2
 2011-02-28 05:54:07 +00:00
Launchpad Translations on behalf of openerp eba20645f9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110224061559-uvwy3pqqdo1gtgx8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225060457-5wocg4ecjy0vhxrl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110227062217-eev5qb158tjq5t5h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110228055344-2wm3uj29hj1f2lpa
 2011-02-28 05:53:44 +00:00
Launchpad Translations on behalf of openerp 1bfe6c8df9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110226050040-nkymkib29qktvvqm
 2011-02-26 05:00:40 +00:00
Jay Vora (OpenERP) 6f5b085c1c [MERGE] Merged the branch for the fix of bug 718616 
lp bug: https://launchpad.net/bugs/718616 fixed

bzr revid: jvo@tinyerp.com-20110225181141-v32xfonsja5qnjqt
 2011-02-25 23:41:41 +05:30
Quentin (OpenERP) 1ab1c15e3c [MERGE] merged bugfix 723176 
bzr revid: qdp-launchpad@openerp.com-20110225150850-vsky0v20x627c70v
 2011-02-25 16:08:50 +01:00
Quentin (OpenERP) fb6c8c1bbf [MERGE] bugfix 718616 
bzr revid: qdp-launchpad@openerp.com-20110225145953-mvkmixnm1imbl61f
 2011-02-25 15:59:53 +01:00
Quentin (OpenERP) c2c46a6260 [MERGE] bugfix 723443 
bzr revid: qdp-launchpad@openerp.com-20110225145706-3571oc4vppat75lm
 2011-02-25 15:57:06 +01:00
Quentin (OpenERP) 0b2cdd30ed [MERGE] merged bugfix 722686 
bzr revid: qdp-launchpad@openerp.com-20110225145542-guupidiukbjjjqje
 2011-02-25 15:55:42 +01:00
Quentin (OpenERP) 45f264dca7 [MERGE] merged bugfix 722961 
bzr revid: qdp-launchpad@openerp.com-20110225145347-p4x82nevh09nnhdr
 2011-02-25 15:53:47 +01:00
Quentin (OpenERP) 41b6096a08 [MERGE] merged bugfix 722699 
bzr revid: qdp-launchpad@openerp.com-20110225144403-ipbb4xl0k3mvpsok
 2011-02-25 15:44:03 +01:00
Quentin (OpenERP) 3769897d69 [MERGE] merged bugfix 720138 
bzr revid: qdp-launchpad@openerp.com-20110225144154-ijyurv65spd5lsdx
 2011-02-25 15:41:54 +01:00
Quentin (OpenERP) a56dde158e [MERGE] merged bugfix 716107 
bzr revid: qdp-launchpad@openerp.com-20110225141114-uxyug5oby21ngm07
 2011-02-25 15:11:14 +01:00
Quentin (OpenERP) 8fe11d0c1b [MERGE] bugfix 720629 
bzr revid: qdp-launchpad@openerp.com-20110225140314-fjvkuk1e5w7pdwug
 2011-02-25 15:03:14 +01:00
Quentin (OpenERP) bd02d3e2e6 [IMP] hr_expense/hr_expense.py improved translability and allow to switch in tree view once the invoice is open 
bzr revid: qdp-launchpad@openerp.com-20110225140154-79lg4tr1n4pd3x4w
 2011-02-25 15:01:54 +01:00
Quentin (OpenERP) 62b785285a [FIX] hr_expense: do not validate the invoice created from a hr_expense automatically 
bzr revid: qdp-launchpad@openerp.com-20110225134844-wrjp0p51gqg1bafo
 2011-02-25 14:48:44 +01:00
mtr 4196288c4e [IMP] hr_payroll:improved the string for boolean field on salary rule 
bzr revid: mtr@mtr-20110225133552-po1y1y7gu14rhk6b
 2011-02-25 19:05:52 +05:30
mtr e703cdfad1 [IMP] hr_payroll:added Child Rules as one2many on Salary Rules 
bzr revid: mtr@mtr-20110225133339-0f0711n4kaijl6p6
 2011-02-25 19:03:39 +05:30
Quentin (OpenERP) f1e62cf560 [MERGE] bugfix of bug number 720627 
bzr revid: qdp-launchpad@openerp.com-20110225133259-qy3a7b11tuktgfb1
 2011-02-25 14:32:59 +01:00
Quentin (OpenERP) e9b0d86ea6 [MERGE] merged bugfix of bug 720623 
bzr revid: qdp-launchpad@openerp.com-20110225132457-hxxbr3vn6m4vvf14
 2011-02-25 14:24:57 +01:00
mtr deec616aa5 [IMP] hr_payroll: improved Salary Head,added 'salary.head.type' object and 'salary rule' as m2m on employee,removed one2many 'Child Salary Structure' 
bzr revid: mtr@mtr-20110225130726-5bc1b5hf2cgefeo3
 2011-02-25 18:37:26 +05:30
Thibault Francois d88be07732 [FIX] user in the log was always the admin 
bzr revid: tfr@openerp.com-20110225094433-51svwaae26hc2a28
 2011-02-25 10:44:33 +01:00
ksa (Open ERP) d47a8d8825 [FIX]: Purchase : invoice opened from the purchase order (second tab) only proposes the journal "sales" 
bzr revid: ksa@tinyerp.co.in-20110225064642-ez74mzbe5ml3rpgk
 2011-02-25 12:16:42 +05:30
Launchpad Translations on behalf of openerp 5734ee225a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110224061639-agrphsv7latpjk8o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225060542-bz7wfv19ahspukiw
 2011-02-25 06:05:42 +00:00
Launchpad Translations on behalf of openerp adcd9eaa27 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225044009-gb32846xiwjlmimn
 2011-02-25 04:40:09 +00:00
Jay Vora (OpenERP) 3b9d87426c [FIX] Purchase : Relevant invoices should be opened in the format of Supplier invoice 
lp bug: https://launchpad.net/bugs/724516 fixed

bzr revid: jvo@tinyerp.com-20110224195710-pgi7oqpdt4en7x28
 2011-02-25 01:27:10 +05:30
Thibault Francois 41cf1e36c6 [FIX] use uid = 1 for audittrails read/write to avoid acess rule problem 
bzr revid: tfr@openerp.com-20110224165221-slwpk4x0okqeub6f
 2011-02-24 17:52:21 +01:00
Thibault Francois e20422ef9b [MERGE] crm-improvement project 
bzr revid: tfr@openerp.com-20110224152851-kflj1ymf3830e1f4
 2011-02-24 16:28:51 +01:00
Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict 
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
 2011-02-24 16:03:09 +01:00
mtr a59188e080 [IMP] hr_payroll: improvements-Salary Rules 
bzr revid: mtr@mtr-20110224131220-468gscq24wbr3pt6
 2011-02-24 18:42:20 +05:30