lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7e1cf124b8
dolibarr/htdocs
History
Marcos García de La Fuente 7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
..
accountancy Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
adherents Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
admin Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
asterisk Removed closing php tag 2014-05-03 18:18:44 +02:00
barcode More substitutions 2014-06-12 11:31:53 +02:00
bookmarks More substitutions 2014-06-12 11:31:53 +02:00
boutique Align size for accounting account & Drop old table & Typo 2014-06-29 07:57:42 +02:00
cashdesk Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
categories Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
comm Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
commande Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
compta Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
conf Qual: Better error message for LDAP connection 2014-04-27 14:16:29 +02:00
contact Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
contrat Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
core Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
cron Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
ecm Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
expedition Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
exports Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
externalsite Removed closing php tag 2014-05-03 18:18:44 +02:00
fichinter Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
fourn Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
ftp More substitutions 2014-06-12 11:31:53 +02:00
holiday Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
imports Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
includes License violation: Missing source on min file. 2014-05-27 00:26:53 +02:00
install Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
langs Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 2014-06-30 00:42:17 +02:00
livraison Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
mailmanspip/class Removed closing php tag 2014-05-03 18:18:44 +02:00
margin Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
opensurvey Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
paybox Removed closing php tag 2014-05-03 18:18:44 +02:00
paypal Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
printipp Removed closing php tag 2014-05-03 18:18:44 +02:00
product Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
projet Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
public Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
resource Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
societe Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
support Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
theme New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
user Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
webservices Merge branch 'develop' into syslog 2014-07-02 21:20:02 +02:00
.gitignore Update ignore file 2013-12-10 22:58:39 +01:00
cache.manifest Fix: Removed useless file (not correctly defined) to avoid cache 2013-05-26 03:57:34 +02:00
disabled.php
document.php Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
favicon.ico
filefunc.inc.php Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
index.php Removed closing php tag 2014-05-03 18:18:44 +02:00
main.inc.php Merge pull request #1679 from defrance69/patch-1 2014-06-23 20:28:53 +02:00
master.inc.php Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
robots.txt
viewimage.php Work on barcode number generation. 2014-01-30 18:21:04 +01:00