Commit Graph
26956 Commits
Author SHA1 Message Date
Mustufa Rangwala b45746ac3a [MERGE] Account: Reports fields_view_get removed and used xpath for PL,Account balnace, aged partner balance report (for journalids)
bzr revid: mra@mra-laptop-20101228053846-htbq7lfhicp7u07l
2010-12-28 11:08:46 +05:30
Sbh (OpenERP) b20b28f547 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101228053228-9zocuzm50hlf97lu
2010-12-28 11:02:28 +05:30
uco (OpenERP) b028b958f1 [MERGE]
bzr revid: uco@tinyerp.com-20101228052901-uau3q7quz0383kbz
2010-12-28 10:59:01 +05:30
Sbh (OpenERP) a35f4c079a [Merge] Merg with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101228051443-cakt4uwndxlbpi0w
2010-12-28 10:44:43 +05:30
ARA (OpenERP) eece769abc [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20101228051126-fd0ioqpens4hr8y7
2010-12-28 10:41:26 +05:30
ARA (OpenERP) ec96c84818 [REF] account :Improve fields_view_get
bzr revid: ara@tinyerp.com-20101228050512-05egnczwozxfuo4a
2010-12-28 10:35:12 +05:30
Launchpad Translations on behalf of openerp 635e68beff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101228043943-yn9g7d3fwe9zzqi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20101228044349-82c2r8qkjdh917at
2010-12-28 04:43:49 +00:00
ron@tinyerp.com de0cd75954 [FIX]mrp-Constraint needed for orderpoints(minimum stock rule)
lp bug: https://launchpad.net/bugs/634856 fixed

bzr revid: ron@tinyerp.com-20101228043543-8ssfit6l3rpfbsuu
2010-12-28 10:05:43 +05:30
Mustufa Rangwala a1864a13cb [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101228041520-hyzekic193kox0in
2010-12-28 09:45:20 +05:30
mtr 84b71877ee [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20101228040646-7zvz505vngje86j6
2010-12-28 09:36:46 +05:30
Antony 3c6006b344 [IMP] add association root menu images
bzr revid: antony@openerp-laptop-20101227173344-0c69w3g4rg9jf8he
2010-12-27 18:33:44 +01:00
Antony 48df9efa69 [IMP] add marketing root menu images
bzr revid: antony@openerp-laptop-20101227171407-tc25pp157rqhp8s9
2010-12-27 18:14:07 +01:00
Fabien Pinckaers 21b9caa46b fix
bzr revid: fp@tinyerp.com-20101227170054-ochgr9x88l4wun2x
2010-12-27 18:00:54 +01:00
Fabien Pinckaers dd442961fb [FIX] Complete recode of import_data to clean and fix export with import compatible.
bzr revid: fp@tinyerp.com-20101227164621-mjb6n49f9i5bkeoh
2010-12-27 17:46:21 +01:00
Vo Minh Thu 0e7f74342a [IMP] base_crypt: caches are per db.
bzr revid: vmt@openerp.com-20101227161234-kmg2gp1mvpav0qpb
2010-12-27 17:12:34 +01:00
Jay (OpenERP) 93e9e449ff [FIX] Correction on previous commit, menu placed correctly
bzr revid: jvo@tinyerp.com-20101227143850-ags2m9i4eqhg6xkq
2010-12-27 20:08:50 +05:30
Antony 22074d96f9 merge fde groups and access rights updates.
bzr revid: antony@openerp-laptop-20101227142631-8m03niwy061hmmx1
2010-12-27 15:26:31 +01:00
Antony 4a5727a740 merge openerp-report/openobject-server/report-server-apa, res_widget update
bzr revid: antony@openerp-laptop-20101227140617-ws3n6eae0yamdd55
2010-12-27 15:06:17 +01:00
Antony d2b0c3d074 merge server trunk
bzr revid: antony@openerp-laptop-20101227140123-xtc8b2k3kgi4qcoj
2010-12-27 15:01:23 +01:00
Vo Minh Thu 8f8001d5f0 [IMP] translate: load language xx before xx_XX and overwrite only when a translation is available.
bzr revid: vmt@openerp.com-20101227135800-qwvsk4xwhzrjg6yf
2010-12-27 14:58:00 +01:00
Sbh (OpenERP) 6d84b87556 [Fix] stock: remove the purchase_id and sale_id. stock is not depend of sale and purchase
bzr revid: sbh@tinyerp.com-20101227125916-iasjw331u7xm856u
2010-12-27 18:29:16 +05:30
François Degrave 15f577bfeb [IMP] rename internal user -> employee, remove product manager, instead: sale manager, warehouse manager, purchase manager,manufacturing manager have the rights, remove Usability No One, Move low level to Administration -> Customization -> Low level
bzr revid: fde@openerp.com-20101227125911-41521z6ctmmbxrru
2010-12-27 13:59:11 +01:00
François Degrave fbcd076ed9 [IMP] rename internal user -> employee, remove product manager, instead: sale manager, warehouse manager, purchase manager,manufacturing manager have the rights, remove Usability No One, Move low level to Administration -> Customization -> Low level
bzr revid: fde@openerp.com-20101227125854-cdnvig1wlbo0p6ko
2010-12-27 13:58:54 +01:00
ARA (OpenERP) b39108f128 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20101227124927-5e65bzffc4d4duux
2010-12-27 18:19:27 +05:30
ARA (OpenERP) fc81ca6a69 [REF] account :Improve fields_view_get
bzr revid: ara@tinyerp.com-20101227124530-pnzjbkknemkt2ppy
2010-12-27 18:15:30 +05:30
Sbh (OpenERP) 9f0e3f8481 [MERGE] merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101227124321-1x0xs79sp555g33d
2010-12-27 18:13:21 +05:30
Mustufa Rangwala 3f818581a2 [MEREG] POS: Point of Sale Journals credits customer debtor account instead of product's income accounts (v6rc1)
bzr revid: mra@mra-laptop-20101227113105-3qkul1c3bz89v0ft
2010-12-27 17:01:05 +05:30
Sbh (OpenERP) 2b37a7b5c9 [MERGE] Merge crm and project improvement
bzr revid: sbh@tinyerp.com-20101227112312-1jh1iit9ql4yk1us
2010-12-27 16:53:12 +05:30
jam-openerp 1634cb448a [MREGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
bzr revid: jam@tinyerp.com-20101227111356-h1ais2jbb15ozp44
2010-12-27 16:43:56 +05:30
Vo Minh Thu d3d48fd151 [IMP] base_crypt: make sure to also clear the salt cache.
bzr revid: vmt@openerp.com-20101227111111-4xw1bkjij343jzpm
2010-12-27 12:11:11 +01:00
uco (OpenERP) 062e74ccd3 [MERGE]
bzr revid: uco@tinyerp.com-20101227110612-5yx410cxu0gbrd7k
2010-12-27 16:36:12 +05:30
Mustufa Rangwala f96a70ec6a [MERGE] Account: Balance sheet report visible reserve and surplus field
bzr revid: mra@mra-laptop-20101227105043-5j8k7qxx8g0ktn01
2010-12-27 16:20:43 +05:30
François Degrave 53ea5a328b [IMP] security groups for HR + 'group by' in extended views in some views (stock moves, mrp, documents)
bzr revid: fde@openerp.com-20101227104651-23h1xm7hh2qnr7m7
2010-12-27 11:46:51 +01:00
pso 53b327827b [FIX] point_of_sale: Set product income acc for credit
lp bug: https://launchpad.net/bugs/694107 fixed

bzr revid: pso@tinyerp.com-20101227104432-c86phvftbo1l0bx7
2010-12-27 16:14:32 +05:30
François Degrave a580c07159 [IMP] added 'filter' element among the authorized elements in <data> tags
bzr revid: fde@openerp.com-20101227104155-1nq3mpa1spcmgj3a
2010-12-27 11:41:55 +01:00
uco (OpenERP) 4c44688e01 [FIX] crm: Removed section_id field to fix type error on web-client.
bzr revid: uco@tinyerp.com-20101227104046-72l8uzq298rvwop5
2010-12-27 16:10:46 +05:30
pso 26e95e3cd4 [MERGE] merge from trunk addons3
bzr revid: pso@tinyerp.com-20101227065424-r1npesy90h2dra4h
bzr revid: pso@tinyerp.com-20101227103219-tac58odle7l6hwp4
2010-12-27 16:02:19 +05:30
ARA (OpenERP) d0cddcdea2 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20101227100752-fi4lw5kl1idoa5qm
2010-12-27 15:37:52 +05:30
ARA (OpenERP) 2210c4cd4e [REF] account :In balance sheet report wizard add reserve_account_id as per xrg patch
bzr revid: ara@tinyerp.com-20101227100458-r09ksc03jkiaesin
2010-12-27 15:34:58 +05:30
Harry (OpenERP) 96fcf28f19 [FIX] crm: typo
bzr revid: hmo@tinyerp.com-20101227100000-glr05umryqisghdh
2010-12-27 15:30:00 +05:30
atp-openerp, jam-openerp 581eadf130 [FIX] caldav wizard : Cancel Button removed
bzr revid: jam@tinyerp.com-20101227095902-mwek85xt84346j8y
2010-12-27 15:29:02 +05:30
atp-openerp, jam-openerp de7223c48b [IMP] caldav wizard for synchronizing calendar
bzr revid: jam@tinyerp.com-20101227095609-nofn0cw0wr3oxdfw
2010-12-27 15:26:09 +05:30
Sbh (OpenERP) 85dacde05f [MERGE] Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
bzr revid: sbh@tinyerp.com-20101227094953-8p70yt1pg31b9l5n
2010-12-27 15:19:53 +05:30
P. Christeas aedda16fb9 point_of_sale: tolerate empty receipts in reports, pass the tests
bzr revid: p_christ@hol.gr-20101227085504-er2n08ppgga9qpcg
2010-12-27 10:55:04 +02:00
P. Christeas cdd21ff45a account: currency has 'name', not 'code' in reports
Conflicts:

	account/report/account_general_ledger_landscape.rml

bzr revid: p_christ@hol.gr-20101227085407-7xscj9bkufvpe4x9
2010-12-27 10:54:07 +02:00
P. Christeas 5c75da21ed account: stub get_partners() for general Ledger report
bzr revid: p_christ@hol.gr-20101227085237-6103qruq8l5o8yfd
2010-12-27 10:52:37 +02:00
P. Christeas 0280e0a939 i18n: fix error in crm/fr.po
bzr revid: p_christ@hol.gr-20101227085055-eqcijh21lcf26zey
2010-12-27 10:50:55 +02:00
P. Christeas dfb589e128 l10n_it, account_voucher: expand tabs
and keep the lint-check happy

bzr revid: p_christ@hol.gr-20101227085048-94sm9jporlfwzuyy
2010-12-27 10:50:48 +02:00
Ferdinand Gassauer dc8fef96db sale_report: fix division by zero [Bug 692698]
bzr revid: p_christ@hol.gr-20101227085040-wuf9etq22vsu54pr
2010-12-27 10:50:40 +02:00
P. Christeas 47b85907f3 purchase/report: Avoid division by zero with NULLIF [Bug 692698]
This has to be attributed to Dr. Ferdinand Gassauer, who reported
the issue and first published the patch.

bzr revid: p_christ@hol.gr-20101227085038-gy580ywddr43e3ar
2010-12-27 10:50:38 +02:00