Commit Graph
42644 Commits
Author SHA1 Message Date
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
P. Christeas 11bab66faa crm: remove trailing whitespace, utf8 apostrophe.
bzr revid: p_christ@hol.gr-20101227085032-bkun8ia2sije5l2p
2010-12-27 10:50:32 +02:00
P. Christeas b0391a21b9 crm/test: fill missing categ_id from wizard data.
bzr revid: p_christ@hol.gr-20101227085025-noa1grxebxo12klu
2010-12-27 10:50:25 +02:00
P. Christeas 79722d54aa survey: let fields_view_get work w/o context, to keep tests happy.
Since the orm_memory changes in pg84 server, the wizard won't work
without the 'survey_id' field set. It would be pointless, so skip
that, too.

bzr revid: p_christ@hol.gr-20101227085018-cxgclsuwypylxbvy
2010-12-27 10:50:18 +02:00
P. Christeas 4c49629d1e l10n_ch: dirty workaround for bvr_report, when no bank is set
According to CampToCamp, this module is already deprecated, so I just
put a few lines to keep the tests happy.

bzr revid: p_christ@hol.gr-20101227085009-1smjzmpz45omm3kb
2010-12-27 10:50:09 +02:00
P. Christeas 0ca6e99f67 analytic_analysis: Fix typo of "Theorical" -> Theoretical
bzr revid: p_christ@hol.gr-20101227084813-usth1z7afmddmdbe
2010-12-27 10:48:13 +02:00
P. Christeas 9d5d5909a7 document: default storage and root folders are not updatable
They shall only be constructed once, and never be updated from xml again,
because that could lead to data loss (or at least hiding it).

bzr revid: p_christ@hol.gr-20101227084803-v4sfq8brl4u25w71
2010-12-27 10:48:03 +02:00
P. Christeas 7134f0c800 account_invoice_layout: remove duplicate demo data, write a report test
Nothing to do with production usage, but let us test the "test_reports"
API using this case of "active_id" + wizard_data report.

bzr revid: p_christ@hol.gr-20101227084158-4q8bawl8k4jjtbam
2010-12-27 10:41:58 +02:00
P. Christeas 61d64a1fc0 account: journal view types should have a translatable name
bzr revid: p_christ@hol.gr-20101227084109-kqlszo2nmt1esupa
2010-12-27 10:41:09 +02:00
P. Christeas 5d4c5c1a5d account.partner.balance: cleanup, let strings be translatable
bzr revid: p_christ@hol.gr-20101227084103-3rcjmfgbvh7oh1va
2010-12-27 10:41:03 +02:00
P. Christeas a66965ae0d purchase: fix erron in nl.po
bzr revid: p_christ@hol.gr-20101227084039-eedrkrbdyq45ekh1
2010-12-27 10:40:39 +02:00
P. Christeas 339c038fe1 mrp_repair: expand tabs
bzr revid: p_christ@hol.gr-20101227084032-mdh00tcnaqq9sz2n
2010-12-27 10:40:32 +02:00
P. Christeas 21d9d10681 hr_expense, payroll_account: Correct the English word "Expanse"
We obviously mean "expense" as in spending, not "expanse" as in stretch.

bzr revid: p_christ@hol.gr-20101227083850-u61v7sju7x29ndsw
2010-12-27 10:38:50 +02:00
Sbh (OpenERP) 72fa0580cd [REM] crm: remove print statement
bzr revid: sbh@tinyerp.com-20101227083000-6n5536k753i5t1y9
2010-12-27 14:00:00 +05:30
Sbh (OpenERP) c930d529d1 [MERGE] Merge correct security rule of company_id and crm_claim change
bzr revid: sbh@tinyerp.com-20101227082444-nrbcokxnv14hqr3d
2010-12-27 13:54:44 +05:30
Sbh (OpenERP) 12e918ba03 [MERGE] merge with team1 branch
bzr revid: sbh@tinyerp.com-20101227081009-21mt9rjq9f6ykp1p
2010-12-27 13:40:09 +05:30
Mustufa Rangwala f053c0a1ac [REF]
bzr revid: mra@mra-laptop-20101227073746-2jsoxgm2c18doo2j
2010-12-27 13:07:46 +05:30
Mustufa Rangwala 36550876a0 [REF]
bzr revid: mra@mra-laptop-20101227073156-ovwnsscdqpulq0le
2010-12-27 13:01:56 +05:30
Ferdinand @ Camptocamp 11cdeb9929 [FIX] Sale: Sale report => sale_report - wrong table join
lp bug: https://launchpad.net/bugs/694248 fixed

bzr revid: mra@mra-laptop-20101227070220-s4v56ta762n3ztyt
2010-12-27 12:32:20 +05:30
Sbh (OpenERP) 5aec3a612d [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101227065345-nx77uqseiu9apvzk
2010-12-27 12:23:45 +05:30
uco (OpenERP) 0fbb5d3b7b [MERGE]
bzr revid: uco@tinyerp.com-20101227064033-f01qypl6j6vbhcyw
2010-12-27 12:10:33 +05:30
pso 09a2c9d1f1 [IMP] account: Improved general and partner ledger reports
bzr revid: pso@tinyerp.com-20101227063129-u063vl1nst5rg4c7
2010-12-27 12:01:29 +05:30
ARA (OpenERP) 242616ebe8 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20101227060425-bve3jxovvtjnong3
2010-12-27 11:34:25 +05:30
Mustufa Rangwala 8ed03e2da9 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101227054418-jmw8oqd4q6f5o1v0
2010-12-27 11:14:18 +05:30