Commit Graph

47779 Commits

Author SHA1 Message Date
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
Gauthier
105e024c48 @param desc 2015-02-12 13:20:03 +01:00
Sof
09013c7e1c FIX : Let ability to use IDPROF verifications even if new entry is "private"
We do not check for duplicate or empty id_prof fields while inserting a new entry when verifications options are set to "ON" in the third party configuration panel.
2015-02-12 13:00:22 +01:00
Gauthier
be56f76743 FIX : Display error on dispatched quantity when we have several times same product in a supplier order 2015-02-12 12:56:21 +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
jean
1f31ff338c correction for fetch sql 2015-02-11 14:39:32 +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
Florian HENRY
2ad2013e92 Merge branch '3.7_bug1840' into 3.7 2015-02-11 11:51:48 +01:00
Florian HENRY
e9bfa71556 syntax 2015-02-11 11:49:06 +01:00
Florian HENRY
db2dee7c03 syntax 2015-02-11 11:48:11 +01:00
Florian HENRY
db94860f76 syntax 2015-02-11 11:47:12 +01:00
Florian HENRY
73f1d10b72 syntax 2015-02-11 11:46:29 +01:00
Florian HENRY
7f5e4aa135 FIX : bug #1840 Email template modules in HTML are not render correctly 2015-02-11 11:44:49 +01:00
Florian HENRY
8af845f27d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-11 11:41:50 +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
Raphaël Doursenaud
7dea799a9e FIXED Allowed 0 to be used as an account mask
0 is used by some accounting systems and software.
2015-02-10 17:18:32 +01:00
jean
2820bd24ac fetch must contain an left join on c_actioncom for correct function 2015-02-10 16:03:31 +01:00
Marcos García de La Fuente
e485dd413d PHPDoc and misc fixes for several folders 2015-02-10 13:41:59 +01:00
Marcos García de La Fuente
530186c59d PHPDoc and misc fixes for several folders 2015-02-10 13:32:00 +01:00
Arnaud Aujon Chevallier
863c1f7a13 fix typo in createOrder 2015-02-10 13:21:36 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
phf
24a970a109 [CORE] ajout de la gestion incoterm sur les pages commande et à l'objet (#incoterm). 2015-02-10 12:22:07 +01:00
phf
560d836943 [CORE] corrections mineurs sur des tests (#incoterm). 2015-02-10 12:21:29 +01:00
Florian HENRY
cc87a6fe12 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-10 11:55:31 +01:00
phf
36304234d2 [CORE] ajout de l'incoterm sur les pages propal et à l'objet (#incoterm). 2015-02-10 11:46:35 +01:00
phf
2a1a5e74c6 [CORE] mise à jour de l'objet pour l'info bulle après modification de l'incoterm (#incoterm). 2015-02-10 11:46:09 +01:00
phf
791bd7e9d9 [CORE] retrait la page de configuration et des tests sur la variable d'activation du module qui est inutile (#incoterm). 2015-02-10 11:45:23 +01:00
phf
e27ff07e29 [CORE] retrait de la page de configuration qui est inutile (#incoterm). 2015-02-10 11:44:14 +01:00
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
ca939bf8a5 PHPDoc and misc fixes for several folders 2015-02-10 11:02:11 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00