lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7075ac74c4
dolibarr/htdocs
History
Marcos García de La Fuente 7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
..
accountancy Update purchasesjournal.php 2015-03-11 10:23:33 +01:00
adherents Clean code 2015-03-17 10:52:27 +01:00
admin Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
asterisk Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
barcode Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 2015-02-18 22:54:02 +01:00
bookmarks QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
cashdesk Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00
categories Merge pull request #2504 from marcosgdf/constants 2015-03-30 09:25:18 +02:00
comm Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
commande Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
compta Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
conf Delete phpinfo.php 2015-04-01 18:57:54 +02:00
contact Typo 2015-03-31 08:45:36 +02:00
contrat Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
core Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
cron Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
custom Ignore content of directory custom 2015-01-18 13:07:39 +01:00
don Travis Fix don.class.php 2015-04-02 18:48:47 +02:00
ecm QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
expedition Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
expensereport Doxygen 2015-03-17 11:23:45 +01:00
exports Fix filters for exports 2015-04-02 16:58:36 +02:00
externalsite Fix: syntax error 2014-12-04 01:23:39 +01:00
fichinter Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
fourn Comments 2015-04-03 00:28:35 +02:00
ftp Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
holiday QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
imports Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
includes Fixed line endings 2015-03-15 18:01:21 +01:00
install Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
langs Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
livraison QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
loan Work on payment loan 2015-03-29 17:53:36 +02:00
mailmanspip Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
margin Implemented constants for Product class 2015-03-30 03:14:07 +02:00
opensurvey Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
paybox Replace <center> tags 2014-11-25 20:13:43 +01:00
paypal Merge remote-tracking branch 'origin/3.7' into develop 2014-12-26 04:57:55 +01:00
printing Fix doxygen 2015-02-11 15:05:52 +01:00
product Merge branch 'develop' into units 2015-04-03 15:45:54 +02:00
projet Merge pull request #2529 from aspangaro/develop-don 2015-04-02 11:42:15 +02:00
public Correct path 2015-03-26 21:03:56 +01:00
resource QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
societe NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 2015-04-01 21:00:51 +02:00
support Scrutinizer Auto-Fixes 2015-03-16 23:21:17 +00:00
theme Fix: class not defined 2015-04-02 17:35:07 +02:00
user Work on md theme 2015-03-24 22:24:15 +01:00
webservices Merge branch 'develop' into constants 2015-03-30 02:36:46 +02:00
.gitignore Better doc to install external modules. 2015-01-09 13:00:10 +01:00
cache.manifest Fixed: bad url 2015-01-22 23:49:32 +01:00
disabled.php
document.php
favicon.ico
filefunc.inc.php Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
index.php Comment 2015-03-31 17:23:07 +02:00
main.inc.php Work on md theme 2015-03-24 22:24:15 +01:00
master.inc.php trigger on total 2014-08-12 11:40:24 +02:00
robots.txt
viewimage.php