dolibarr/htdocs
Marcos García de La Fuente b1c552ee9d Merge branch 'develop' into prod-attr
# Conflicts:
#	htdocs/install/mysql/tables/llx_product_attribute.key.sql
#	htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
2016-07-24 11:54:38 +02:00
..
accountancy Merge pull request #5437 from Oeris/oeris-bookkeeping 2016-07-14 23:10:03 +02:00
adherents NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 2016-07-21 20:45:30 +02:00
admin Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany 2016-07-20 19:34:51 +02:00
api Removed warnings 2016-05-29 11:26:05 +02:00
asterisk
attributes NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
barcode
bookmarks
cashdesk Increase max size of number of product into list 2016-06-26 23:15:20 +02:00
categories internationalization of code comment 2016-07-05 17:20:32 +02:00
comm NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
commande Merge branch 'develop' into prod-attr 2016-07-24 11:54:38 +02:00
compta Merge branch 'develop' into prod-attr 2016-07-24 11:54:38 +02:00
conf A more complete example 2016-06-25 15:27:16 +02:00
contact Merge pull request #5481 from defrance/patch-12 2016-07-20 18:23:35 +02:00
contrat NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
core Merge branch 'develop' into prod-attr 2016-07-24 11:54:38 +02:00
cron
custom
don Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-21 10:30:51 +02:00
ecm FIX Bad sort link on ECM module for automatic tab 2016-07-11 02:06:46 +02:00
expedition Merge pull request #5388 from atm-florian/dev_new_ship_tag_mail 2016-07-15 14:31:17 +02:00
expensereport Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-21 10:30:51 +02:00
exports Fix when going back on an export page after session has expired to avoid 2016-07-15 14:14:55 +02:00
externalsite
fichinter Selection of fields ok for interventions 2016-07-06 10:28:34 +02:00
fourn NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
ftp
holiday NEW Can filter on type of leave requests in list 2016-07-23 11:18:22 +02:00
hrm Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
imports Update import.php 2016-06-16 20:18:58 +02:00
includes Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-16 19:54:57 +02:00
install Merge branch 'develop' into prod-attr 2016-07-24 11:54:38 +02:00
langs Merge branch 'develop' into prod-attr 2016-07-24 11:54:38 +02:00
livraison Fix var not initialized 2016-06-28 02:36:40 +02:00
loan Clean language files 2016-06-18 11:06:11 +02:00
mailmanspip
margin Minor fixes 2016-06-20 11:43:53 +02:00
multicurrency/class add log and toher multicurrency bug fix for PgSQL 2016-06-30 14:24:55 +02:00
opensurvey
paybox
paypal
printing
product NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
projet NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 2016-07-21 20:45:30 +02:00
public Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
resource Minor esthetic fixes 2016-06-07 13:15:38 +02:00
societe NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 2016-07-21 20:45:30 +02:00
supplier_proposal Fix var not initialized 2016-06-28 02:36:40 +02:00
support
theme Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
user Merge pull request #5364 from tysauron/patch-7 2016-07-20 19:15:41 +02:00
webservices FIX #5479 using uninitialized variable $socid and other stuffs 2016-07-15 23:14:15 +02:00
websites Fix bad encoding of param 2016-07-15 10:23:53 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php Prepare 3.9.3 2016-07-16 19:38:58 +02:00
index.php Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
main.inc.php Fix: missing 'Maximize' button on full toolbar set of ckeditor. 2016-07-14 11:46:32 +02:00
master.inc.php
robots.txt
viewimage.php Fix: viewimage must not check login for resources medias 2016-07-03 20:50:28 +02:00