lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,336 Commits 43 Branches 150 Tags 886 MiB
2a09e34bdf
Commit Graph

46336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marcos García de La Fuente
0d150b1d32 Removed unused code, misc corrections and corrected PHPDoc problems. 2015-02-10 10:25:59 +01:00
phf
1701ecfd89 [CORE] fonction setIncoterms générique pour mettre à jour les valeurs de incotermsdes différentes tables (#incoterm). 2015-02-10 10:23:38 +01:00
phf
23751c75dc [CORE] fin de la mise en place de la gestion incoterms des sociétés (#incoterm). 2015-02-10 10:22:38 +01:00
Marcos García de La Fuente
6531a5c6c7 Fix: [ bug #1830 ] Salaries payment only allows checking accounts 2015-02-10 09:44:27 +01:00
aspangaro
f1d5e1ba7b FIXED Correct typo on Changelog 2015-02-10 07:14:55 +01:00
Marcos García de La Fuente
a9dc6bb3d7 Fix: [ bug #1826 ] Supplier payment types are not translated in fourn/facture/paiement.php 2015-02-10 00:55:22 +01:00
Marcos García de La Fuente
58a61e1294 Changed int typecast to float 2015-02-10 00:23:32 +01:00
Marcos García de La Fuente
949f9e40a0 Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object 2015-02-10 00:20:47 +01:00
phf
792ec17993 [CORE] ajout de traductions ( #incoterm). 2015-02-09 17:56:06 +01:00
phf
62762f82a9 [CORE] incorporation de l'ajout / modification de l'incoterm sur un tiers (#incoterm 2015-02-09 17:55:43 +01:00