lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97fce71218
dolibarr/htdocs
History
Laurent Destailleur 97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
..
accountancy Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
adherents Missing property 2014-04-25 20:36:13 +02:00
admin Qual: Better type check 2014-04-23 18:23:50 +02:00
asterisk Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
barcode Optimize for small screen 2014-04-22 00:04:31 +02:00
bookmarks Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
boutique Doxygen 2013-11-20 12:55:13 +01:00
cashdesk Replacing invoice integer types with Facture constants 2014-02-26 00:56:36 +01:00
categories Merge remote-tracking branch 'origin/3.5' into develop 2014-04-02 11:41:55 +02:00
comm Merge pull request #1549 from atm-maxime/develop 2014-04-23 21:18:34 +02:00
commande Merge remote-tracking branch 'origin/3.5' into develop 2014-04-12 00:53:25 +02:00
compta New: Add option FACTURE_SENDBYEMAIL_FOR_ALL_STATUS to allow to send 2014-04-23 13:14:55 +02:00
conf Update conf template 2014-04-06 19:09:10 +02:00
contact Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
contrat Hide a column that is always 0. 2014-04-23 13:51:02 +02:00
core Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
cron Qual: Derived missing variable from a known one 2014-04-23 18:24:11 +02:00
ecm Fix: Missing loading lang files. 2014-01-26 18:43:30 +01:00
expedition Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
exports Merge remote-tracking branch 'origin/3.5' into develop 2014-02-26 15:49:29 +01:00
externalsite Experiment hidden option MAIN_MENU_INVERT 2014-04-23 12:22:01 +02:00
fichinter Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
fourn Avoid too long filenames 2014-04-16 23:00:30 +02:00
ftp Corrected admin page style of some modules 2014-03-11 12:02:44 +01:00
holiday Merge remote-tracking branch 'origin/3.5' into develop 2014-03-19 22:29:18 +01:00
imports Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
includes Fix: CRLF 2014-03-15 23:17:46 +01:00
install Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
langs Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
livraison Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
mailmanspip/class Fix: Missing class 2013-08-31 16:58:25 +02:00
margin Merge remote-tracking branch 'origin/3.5' into develop 2014-03-31 00:44:45 +02:00
opensurvey New: On page to enter supplier prices, if there is no supplier, add 2014-04-16 00:06:16 +02:00
paybox Corrected admin page style of some modules 2014-03-11 12:02:44 +01:00
paypal Corrected admin page style of some modules 2014-03-11 12:02:44 +01:00
printipp Qual: Doxygen 2013-08-22 16:49:23 +02:00
product Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
projet Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
public Fix: missing trans 2014-04-25 16:45:14 +02:00
societe New: On page to enter supplier prices, if there is no supplier, add 2014-04-16 00:06:16 +02:00
support Fix: Removed deprecated support links 2013-11-16 15:08:57 +01:00
theme Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
user Merge remote-tracking branch 'origin/3.5' into develop 2014-04-12 00:53:25 +02:00
webservices Update server_thirdparty.php 2014-04-16 16:33:36 +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 Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
document.php Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
favicon.ico Update favicon 2012-09-05 15:35:26 +02:00
filefunc.inc.php Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
index.php Fix: miscellaneous css problems 2014-01-26 18:30:45 +01:00
main.inc.php Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
master.inc.php Better error wording 2013-11-29 17:23:42 +01:00
robots.txt Add example of comment 2012-11-07 02:22:25 +01:00
viewimage.php Work on barcode number generation. 2014-01-30 18:21:04 +01:00