Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
e3713c8b6d85bc2a8381ebbef1c45eca3e47b0bb
dolibarr-fork/htdocs
History
Laurent Destailleur e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
..
accountancy
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
adherents
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
admin
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01: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
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
cashdesk
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
categories
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
comm
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
commande
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
compta
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
conf
Update example
2015-02-16 17:25:26 +01:00
contact
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
contrat
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
core
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
cron
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
custom
Ignore content of directory custom
2015-01-18 13:07:39 +01:00
ecm
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
expedition
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-16 20:59:04 +01:00
expensereport
phpcs
2015-02-17 09:56:19 +01:00
exports
…
externalsite
…
fichinter
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-07 03:28:36 +01:00
fourn
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
ftp
…
holiday
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
imports
Fixed: [ bug #1756 ] PHP error while removing an import profile
2014-12-25 12:09:00 +01:00
includes
Add libs
2015-02-17 11:41:50 +01:00
install
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
langs
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
livraison
Clean code for validate permissions. "validate" is a status to say, "now
2015-01-25 21:32:40 +01:00
mailmanspip
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
margin
Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into
2015-01-31 14:29:15 +01:00
opensurvey
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-16 20:59:04 +01:00
paybox
…
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 pull request #2333 from FHenry/develop_review_productstat
2015-02-18 22:23:33 +01:00
projet
New: Add field "budget" (amount) on projects.
2015-02-16 10:58:05 +01:00
public
Tooltip and cache for boxes
2015-01-23 10:51:12 +01:00
resource
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
societe
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01:00
support
…
theme
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-15 19:51:49 +01:00
user
Merge pull request #2316 from mrsof/develop
2015-02-03 13:44:17 +01:00
webservices
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-19 00:01:26 +01: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
Start 3.6.3
2015-01-09 22:32:25 +01:00
index.php
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
main.inc.php
Better position for username
2015-02-01 01:43:19 +01:00
master.inc.php
…
robots.txt
…
viewimage.php
…