lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a93ba86ce0
dolibarr/htdocs
History
Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
..
accountancy Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
adherents Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
admin Merge pull request #2673 from aternatik/fix_getentity 2015-05-07 00:48:19 +02:00
asterisk
barcode Apply correct tabulation 2015-05-03 11:51:54 +02:00
bookmarks Change generic and setup image title 2015-04-18 23:13:48 +02:00
cashdesk Change generic and setup image title 2015-04-18 23:13:48 +02:00
categories Merge pull request #2756 from aternatik/fix_label_product 2015-05-05 20:25:08 +02:00
comm Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
commande Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
compta Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
conf Delete phpinfo.php 2015-04-01 18:57:54 +02:00
contact Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
contrat Merge remote-tracking branch 'origin/3.7' into develop 2015-05-03 13:00:39 +02:00
core Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
cron Change generic and setup image title 2015-04-18 23:13:48 +02:00
custom
don Change generic and setup image title 2015-04-18 23:13:48 +02:00
ecm
expedition Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
expensereport Merge remote-tracking branch 'Upstream/develop' into develop-ER_project 2015-05-03 14:31:15 +02:00
exports Add an exit to avoid to have apache hangs. 2015-05-05 13:46:28 +02:00
externalsite Change generic and setup image title 2015-04-18 23:13:48 +02:00
fichinter Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
fourn FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
ftp Change generic and setup image title 2015-04-18 23:13:48 +02:00
holiday
imports
includes Qual: moved mobiledetect external library 2015-04-23 20:30:33 +02:00
install Add field to manage reccuring events 2015-05-06 16:44:41 +02:00
langs Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
livraison Copyright 2015-04-18 20:50:03 +02:00
loan Update loan card 2015-04-10 18:26:28 +02:00
mailmanspip
margin FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
opensurvey FIX Adding 5 more choice link into survey module was not working with 2015-05-06 16:37:04 +02:00
paybox Change generic and setup image title 2015-04-18 23:13:48 +02:00
paypal Fix: PHPCS 2015-04-08 00:14:44 +02:00
printing Change generic and setup image title 2015-04-18 23:13:48 +02:00
product Merge remote-tracking branch 'origin/3.7' into develop 2015-05-07 13:35:09 +02:00
projet Merge remote-tracking branch 'origin/3.7' into develop 2015-04-26 16:30:33 +02:00
public FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
resource Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
societe NEW Can edit list of prospect status for customers/prospects. Add a new 2015-05-06 23:13:07 +02:00
support
theme NEW Can edit list of prospect status for customers/prospects. Add a new 2015-05-06 23:13:07 +02:00
user Uniformize code 2015-05-04 11:41:30 +02:00
webservices FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php Fix minor look and security errors 2015-04-21 12:03:51 +02:00
index.php NEW Can edit list of prospect status for customers/prospects. Add a new 2015-05-06 23:13:07 +02:00
main.inc.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-04-28 21:14:17 +02:00
master.inc.php
robots.txt
viewimage.php