Commit Graph

9501 Commits

Author SHA1 Message Date
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Christophe Simonis 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
Christophe Simonis 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
Christophe Simonis 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
Martin Trigaux e0fb0a6434 [FIX] account: when creating partial reconcilation after unreconciliating one invoice, make sure we create this partial reconcilation only if we have at least two lines
bzr revid: mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
2014-05-07 15:35:52 +02:00
Gery Debongnie aeebac88d9 [FIX] code cleanup (addon account)
improve the logic of _journal_item_count (removes try/except/pass, use search_count) and remove useless one2many field in res_partner (journal_item_ids)

bzr revid: ged@openerp.com-20140507121310-ya6m71fvs40rf90d
2014-05-07 14:13:10 +02:00
Launchpad Translations on behalf of openerp 5f5fd653db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072715-4m7kz3factf743c9
2014-05-06 07:27:15 +00:00
Simon Lejeune 139c35800f [FIX] account report_invoice: display the unit of measure in the same cell as the quantity
bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
2014-05-02 15:17:06 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Simon Lejeune 66f5bbcf67 [FIX] account report_invoice: more space to display the taxes, right field to display the fiscal position
bzr revid: sle@openerp.com-20140502130340-22dyefrmj4kqrzdb
2014-05-02 15:03:40 +02:00
Simon Lejeune 7ad6d7a150 [FIX] Report: usage of ids in get_action more consistent: only pass them when they are useful, else pass an empty list
bzr revid: sle@openerp.com-20140502130310-106au0jsza0b3nwe
2014-05-02 15:03:10 +02:00
Antony Lesuisse 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
Denis Ledoux b7c125869f [FIX] account: remove partial fix for forcing right active_ids
This has been fixed in the web client 3991 revid:dle@openerp.com-20140430123818-zzdxmat4c5yg9gg7

bzr revid: dle@openerp.com-20140430125033-44vbf00spawm9mbg
2014-04-30 14:50:33 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Denis Ledoux 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
Richard Mathot (OpenERP) 822393dc04 [REM] Dashboard from manifest
bzr revid: rim@openerp.com-20140429082859-p2nl9ye2f6kd47iz
2014-04-29 10:28:59 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Richard Mathot (OpenERP) 2c3ec2c7e4 [REM] mrp/stock: remmove ACLs related to removed dashboards
bzr revid: rim@openerp.com-20140429081808-hytvlkp461zm2l4o
2014-04-29 10:18:08 +02:00
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
Richard Mathot (OpenERP) 9f35c683e5 [MERGE][IMP] account/account_voucher: new filters and usability minor fixes
bzr revid: rim@openerp.com-20140428101311-quxvr6d3lfa842tl
2014-04-28 12:13:11 +02:00
Jaydeep Barot (OpenERP) 9169be4687 [MERGE][IMP]
stock: more explicit error message for product scraping
account/mail: typos

bzr revid: rim@openerp.com-20140428100544-wpt325tw12ni1t0a
2014-04-28 12:05:44 +02:00
Denis Ledoux 81aeccb3a0 [FIX] account: invoices button on partner sheet only display the customer invoices, and is visible only if the partner is a customer
bzr revid: dle@openerp.com-20140425095123-xvc51uiqt3g18181
2014-04-25 11:51:23 +02:00
Quentin (OpenERP) 7a6b00b651 [MERGE] merged with trunk up to revision 9381
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
Jaydeep Barot 74e8fb0674 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425055958-asoj1wc0pmv7mzds
2014-04-25 11:29:58 +05:30
Jaydeep Barot 9a52ef48ad [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl
2014-04-25 11:23:10 +05:30
Jaydeep Barot 24e6fd332a [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425054902-ls149dxiu4kyxkj5
2014-04-25 11:19:02 +05:30
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Christophe Simonis 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
Jaydeep Barot e82a0ba6c3 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140424072307-1h72tc9krcn8l2o3
2014-04-24 12:53:07 +05:30
Jaydeep Barot a55015b8eb [IMP] remove store=true and add store={} in recouncile field
bzr revid: jar@tinyerp.com-20140424065306-e6q3g48cjee1ybni
2014-04-24 12:23:06 +05:30
Jaydeep Barot dc34d310ff [typo] improve typo for _check_currency_amount constraint
bzr revid: jar@tinyerp.com-20140423121117-xitriiv7mfwvsn35
2014-04-23 17:41:17 +05:30
Jaydeep Barot 19e4d1d6e2 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140422102821-hj5y7o835y80xx2e
bzr revid: jar@tinyerp.com-20140423114744-umaxpodiv3xlvh5s
2014-04-23 17:17:44 +05:30
Jaydeep Barot 7258e428b9 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140423114210-dr026gp4321ll88n
2014-04-23 17:12:10 +05:30
Jaydeep Barot d59d90449c [IMP] add res remove return in if condition
bzr revid: jar@tinyerp.com-20140423114053-wnjqd7408w8sva77
2014-04-23 17:10:53 +05:30
Jaydeep Barot 17213b034a [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140422101543-wkoatwvwzkb730ya
bzr revid: jar@tinyerp.com-20140423065938-iyevq3vfe8qmj1v3
2014-04-23 12:29:38 +05:30
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
Denis Ledoux b981f3f8ef [FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
Martin Trigaux 23268ad677 [FIX] account: avoid tax on name search to execute request with empty journal (if context == {'journal_id': False}) (opw 606875)
bzr revid: mat@openerp.com-20140422135012-6faelx7cf0p8cvab
2014-04-22 15:50:12 +02:00
Ravi Gohil (OpenERP) 70dc4456d7 [FIX] account: Advance search on 'Tax' from journal items leads to traceback if we do not select any journal. (Maintenance Case: 606875)
bzr revid: rgo@tinyerp.com-20140422111115-17e6juruftp3oj2r
2014-04-22 16:41:15 +05:30
Jaydeep Barot 281f94ca83 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140422101757-d0rwuxj4wm25f1ae
2014-04-22 15:47:57 +05:30
Jaydeep Barot 0fa0c6aa78 [IMP] change add groups on groupby company and change icon on groupby company
bzr revid: jar@tinyerp.com-20140422101338-mb7m97rjr48t8gyz
2014-04-22 15:43:38 +05:30
Amit Dodiya e270940c5f [FIX] account_voucher & account_move_line: while we have partial payment and we cancel one payment it also unlink the reconcile/partial reconcile tag from other payment entries also
bzr revid: ado@tinyerp.com-20140422101128-ugudle2s7ysc6n1p
2014-04-22 15:41:28 +05:30
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Jaydeep Barot 5bc04994f3 [IMP] typo error message and validateError and typo in chatter msg
bzr revid: jar@tinyerp.com-20140421065009-4j8z0awc9t4b82tb
2014-04-21 12:20:09 +05:30
Jaydeep Barot 8917f469f7 [IMP] in tax view add filter by purchase and sale and group by company and Tax Application and add group by company in journal.
bzr revid: jar@tinyerp.com-20140421055002-hlco68jwjszdsfp0
2014-04-21 11:20:02 +05:30