lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5c5ff72ecd
dolibarr/htdocs
History
Laurent Destailleur 5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
..
accountancy Fixed: All sql requests are now logged 2014-12-04 01:29:01 +01:00
adherents Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
admin Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
asterisk Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
barcode Bad var 2014-12-04 01:36:53 +01:00
bookmarks Fix: Var not defined 2014-12-04 01:42:23 +01:00
cashdesk Fix Lang for Check Payment Type 2015-01-02 18:10:47 +02:00
categories Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
comm Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
commande Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
compta Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
conf Better doc to install external modules. 2015-01-09 13:00:10 +01:00
contact Fixed: Translations 2014-12-07 18:24:45 +01:00
contrat Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
core Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
cron Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
custom Ignore content of directory custom 2015-01-18 13:07:39 +01:00
ecm Corrected key not translated 2014-12-25 22:20:09 +01:00
expedition Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
exports Fix: Missing field tobuy into service export. 2014-08-29 20:26:27 +02:00
externalsite #1704 Untranslatable token in externalsite module admin 2014-11-20 06:34:50 +01:00
fichinter Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
fourn Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
ftp Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
holiday Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
imports Fixed: [ bug #1756 ] PHP error while removing an import profile 2014-12-23 12:25:21 +01:00
includes Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
install Merge pull request #2185 from marcosgdf/bug-1765 2015-01-18 12:39:25 +01:00
langs Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
livraison Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
mailmanspip Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
margin Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
opensurvey Fixed: Size too low 2015-01-07 11:14:51 +01:00
paybox Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
paypal Resized PayPal logo 2014-12-25 19:17:52 +01:00
printipp Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 2014-12-04 13:20:56 +01:00
product Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
projet Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
public Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
resource Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
societe Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
support Fixed: missing css 2014-12-08 02:51:26 +01:00
theme Add menu image 2015-01-14 19:12:22 +01:00
user Miscellaneous corrections 2014-12-28 20:13:15 +01:00
webservices Fixed: property must be called billed into web service. 2015-01-10 01:07:18 +01:00
.gitignore Better doc to install external modules. 2015-01-09 13:00:10 +01:00
cache.manifest Look: Refresh install style with more neutral colors. Select line style 2014-08-03 11:18:32 +02:00
disabled.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
document.php
favicon.ico
filefunc.inc.php Start 3.6.3 2015-01-09 22:32:25 +01:00
index.php Add : statistics on supplier orders and invoices on home page 2014-10-25 17:22:03 +02:00
main.inc.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
master.inc.php trigger on total 2014-08-12 11:40:24 +02:00
robots.txt
viewimage.php Work on barcode number generation. 2014-01-30 18:21:04 +01:00