Commit Graph

45738 Commits

Author SHA1 Message Date
Laurent Destailleur
4e6d5e1cd1 New: Add filter fields on the subscription list 2015-02-14 19:10:40 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr
standard to replace current one.
2015-02-14 18:39:45 +01:00
Laurent Destailleur
bd4b401281 New: Introduce "_deprecated" keyword into module version when module has
been superseed by another one.
2015-02-14 15:10:06 +01:00
Laurent Destailleur
2a9ba93712 Update test of module inits 2015-02-14 12:32:22 +01:00
Laurent Destailleur
e4e49e8a0b Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/product/stock/product.php
2015-02-12 15:41:48 +01:00
Laurent Destailleur
206a453ce2 Solve confusion into number of order or qty into order. 2015-02-12 15:40:06 +01:00
Laurent Destailleur
c727e2b8ec Fix bad translation
Conflicts:
	htdocs/product/stock/product.php
2015-02-12 15:29:21 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table.
Clean language files for direct print module.
2015-02-12 15:23:31 +01:00
Laurent Destailleur
b49c8f84b6 Fix bad translation 2015-02-12 15:22:04 +01:00
Laurent Destailleur
122a7c199c Prepare a module for mail document generation. 2015-02-12 00:10:15 +01:00
Laurent Destailleur
78ba1fe86e Fix bad null management 2015-02-12 00:01:31 +01:00
Laurent Destailleur
689354f927 New: A default label is suggested for stock correction and transfer
instead of empty string.
2015-02-11 23:54:42 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
17d2368bdc Fix we must use short key 2015-02-11 15:07:20 +01:00
Laurent Destailleur
7869bc0d7f Fix doxygen 2015-02-11 15:05:52 +01:00
Laurent Destailleur
fb3cf4da1e New: The comment of the stock movement when making a supplier order
receiving is also stored into the tracking dispatch table (not only into
stock movement table).
2015-02-11 15:03:33 +01:00
Laurent Destailleur
b9d2de99e1 Translation 2015-02-11 14:46:16 +01:00
Laurent Destailleur
370f6b907e Fix we must use short key 2015-02-11 14:44:40 +01:00
Laurent Destailleur
fd206dbb55 Fix ruleset.xml 2015-02-11 14:28:20 +01:00
Laurent Destailleur
8a6d3aa633 Clean module print system 2015-02-11 14:22:44 +01:00
Laurent Destailleur
d5ec19ef83 Enhance help when running cron script from command line 2015-02-11 13:21:12 +01:00
Laurent Destailleur
2e3400a039 Enhance help when running script from command line 2015-02-11 12:29:39 +01:00
Laurent Destailleur
f124079817 Fix ruleset 2015-02-10 21:49:39 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
Laurent Destailleur
039a184d70 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
2015-02-10 21:13:12 +01:00
Laurent Destailleur
621976317a Fixed error management 2015-02-10 21:08:02 +01:00
Laurent Destailleur
abcf4480de Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-10 21:02:23 +01:00
Laurent Destailleur
fce7a0e36e Bad translation 2015-02-10 21:01:44 +01:00
Laurent Destailleur
3f807a09b4 Doxygen 2015-02-08 00:39:51 +01:00
Laurent Destailleur
381af3e6bc Field amount must be right aligned 2015-02-08 00:32:49 +01:00
Laurent Destailleur
2956f39e38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-08 00:13:03 +01:00
Laurent Destailleur
120838becd Update doc 2015-02-08 00:12:50 +01:00
Laurent Destailleur
24ad1afdd2 Merge pull request #2335 from atm-alexis/3.7
FIX empty discount where created if amount is null
2015-02-08 00:07:48 +01:00
Laurent Destailleur
2c730bf61c Merge pull request #2332 from aspangaro/3.7-patch1
FIXED Review
2015-02-08 00:03:11 +01:00
Laurent Destailleur
dd3dbb0f76 Merge pull request #2330 from aspangaro/develop-typo
Fix : Typo on merge
2015-02-08 00:01:14 +01:00
Laurent Destailleur
1776349a30 Merge pull request #2329 from atm-ph/deliverytime
NEW Deliverytime
2015-02-08 00:00:50 +01:00
Laurent Destailleur
07877bc381 Merge branch 'marcosgdf-bug-1827' into 3.6 2015-02-07 23:57:13 +01:00
Laurent Destailleur
e8b2b22c32 Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1827

Conflicts:
	ChangeLog
2015-02-07 23:56:38 +01:00
Laurent Destailleur
cdc3af7bbe Merge pull request #2327 from aspangaro/3.7
FIXED : Lost field in migration for accountancy
2015-02-07 23:49:47 +01:00
Laurent Destailleur
d10e28db36 Merge pull request #2326 from aaujon/3.6-webservice-order
FIXES Webservice : fk_delivery_address not saved
2015-02-07 23:49:31 +01:00
Laurent Destailleur
6eb0d34032 Merge pull request #2325 from aaujon/3.6-webservices-contact
FIXED #1824 Add ref_ext for Contact webservices
2015-02-07 23:47:19 +01:00
Laurent Destailleur
aac584afda Merge pull request #2320 from defrance69/patch-46
Update paiement.class.php
2015-02-07 23:46:40 +01:00
Laurent Destailleur
505f194689 Merge pull request #2319 from defrance69/patch-45
Update 3.6.0-3.7.0.sql
2015-02-07 23:46:12 +01:00
Alexis Algoud
0ca6661e69 FIX empty discount where created if amount is null for a line with a different tva 2015-02-07 23:42:35 +01:00
Laurent Destailleur
1314d9ce4e Merge pull request #2311 from marcosgdf/bug-1810
Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7
2015-02-07 23:41:48 +01:00
Laurent Destailleur
ef31ca9b84 New: Add balance of each account statement. 2015-02-07 23:32:46 +01:00
Laurent Destailleur
e42290cb88 Update doc 2015-02-07 19:35:00 +01:00
Laurent Destailleur
1d1b3da182 Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
2015-02-07 19:30:28 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
2015-02-07 19:12:22 +01:00