lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d80baaea69
dolibarr/htdocs
History
Laurent Destailleur d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
..
accountancy fix #10006 2018-12-01 00:39:37 +01:00
adherents Fix phpcs 2018-10-30 15:28:11 +01:00
admin Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 13:17:25 +01:00
api FIX remove internal property isextrafieldmanaged from API returns 2018-08-23 19:24:00 +02:00
asset Fix search all 2018-10-23 17:16:46 +02:00
asterisk Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
barcode loadlangs 2018-05-27 09:58:23 +02:00
blockedlog Fix responsive 2018-08-09 22:52:43 +02:00
bookmarks Look and feel v8 2018-06-13 22:57:41 +02:00
cashdesk loadlangs 2018-05-26 19:03:41 +02:00
categories Fix envent message on upload category picture 2018-11-13 14:44:10 +01:00
collab
comm Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
commande Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
compta Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
conf
contact Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-01 18:19:45 +01:00
contrat Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
core Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
cron Fix warnings 2018-09-18 23:48:02 +02:00
custom
dav Create index.html 2018-08-23 15:44:33 +02:00
don Fix sql don.class.php 2018-11-28 16:11:10 +01:00
ecm Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 13:17:25 +01:00
expedition Update expeditionbatch.class.php 2018-10-24 02:24:47 +02:00
expensereport Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
exports Several fixes in look and feel 2018-06-23 14:23:07 +02:00
externalsite clean and update code 2018-06-22 16:27:11 +02:00
fichinter Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:18:13 +01:00
fourn Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 14:29:47 +01:00
ftp clean and update code 2018-06-21 15:01:45 +02:00
holiday fix display holiday month report if none 2018-10-30 21:15:52 +01:00
hrm Fix responsive 2018-09-04 09:37:51 +02:00
imports FIX #9355 2018-09-04 10:53:42 +02:00
includes FIX TCPDF is generated PDF 1.7 but TCPDI was setting version to 1.3 2018-06-08 09:37:26 +02:00
install Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-04 13:17:25 +01:00
langs FIX: #10080 Supplier translations are in english 2018-11-28 10:40:45 +01:00
livraison loadlangs 2018-05-26 21:11:25 +02:00
loan Fix default accounting accounts on loan creation #9643 2018-10-28 09:22:55 +01:00
mailmanspip
margin Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:18:13 +01:00
modulebuilder FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
multicurrency/class Use curl to get rates from CurrecyLayer API 2018-05-30 21:14:51 +02:00
opensurvey Fix logo on public page of survey 2018-08-28 03:03:05 +02:00
paybox Fix setup 2018-09-01 17:50:13 +02:00
paypal Fix setup 2018-09-01 17:50:13 +02:00
printing loadlangs 2018-05-26 17:57:30 +02:00
product Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-01 18:19:45 +01:00
projet Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:18:13 +01:00
public Fix #9929 2018-12-01 15:48:46 +01:00
resource correct link and avoid warning in resource list 2018-11-21 14:06:06 +01:00
societe Fix #10097 2018-12-01 10:38:40 +01:00
stripe Fix app name to match Stripe advice 2018-10-12 19:01:01 +02:00
supplier_proposal FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
support
theme Fix for screen with antiblue system 2018-11-28 16:32:53 +01:00
ticket fix :#9967 2018-12-01 16:27:14 +01:00
user Fix: users categories type is Categorie::TYPE_USER 2018-10-09 14:24:41 +02:00
variants Look and feel v8 2018-06-13 22:57:41 +02:00
webservices wrong position of counter reset 2018-08-12 19:16:49 +02:00
website FIX website in inline edit mode 2018-07-19 16:06:48 +02:00
.gitignore
cache.manifest
document.php Fix NOIPCHECK 2018-04-24 10:17:57 +02:00
favicon.ico Update favicon 2012-09-05 15:35:26 +02:00
filefunc.inc.php Prepare 8.0.4 2018-11-05 13:50:12 +01:00
index.php FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
main.inc.php Fix param dol_invisible_topmenu 2018-06-29 00:21:14 +02:00
master.inc.php
robots.txt
viewimage.php Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-29 19:55:10 +02:00