Laurent Destailleur f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into ...

GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang

2014-10-13 00:50:51 +02:00

..

menus

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

system

Merge remote-tracking branch 'origin/3.6' into develop

2014-09-28 02:14:32 +02:00

tools

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

agenda_extrafields.php

Fix : [ bug #1549 ] Itïs not possible add ExtraFields

2014-08-06 17:38:44 +02:00

agenda_extsites.php

New: Each user can include its own external ics calendar into dolibarr

2014-08-15 17:08:05 +02:00

agenda_other.php

Fix: Can not set option when using in nojs mode.

2014-08-03 22:08:25 +02:00

agenda_xcal.php

Fix: miss dol_fiche_end

2014-10-05 23:26:42 +02:00

agenda.php

New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to

2014-07-06 19:25:15 +02:00

bank.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

barcode.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

boxes.php

Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for

2014-08-01 00:53:29 +02:00

clicktodial.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

commande.php

Fix: uniformize code

2014-09-28 12:53:06 +02:00

company.php

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

2014-08-10 13:37:39 +02:00

compta.php

compta_mode -> accounting_mode

2014-09-21 20:42:46 +02:00

confexped.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

const.php

More substitutions

2014-06-12 11:31:53 +02:00

contract.php

New: add doc models management in contract module

2014-09-28 20:39:02 +02:00

delais.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

dict.php

Fix: Change for php 5.6

2014-09-29 13:21:03 +02:00

dons.php

Move donation receipt to french model cerfa 11580*03

2014-06-15 22:18:19 +02:00

ecm.php

Removed odd tabs from some modules

2014-03-11 11:53:22 +01:00

events.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

expedition.php

Fix: uniformize code

2014-09-25 13:50:01 +02:00

external_rss.php

Migrated old message notifications to the """new""" system

2014-07-20 00:10:40 +02:00

facture.php

Merge pull request #1822 from Devensys/Devlop-PayTotalButton

2014-08-14 01:28:20 +02:00

fckeditor.php

Fix: CheckStyle

2014-07-20 14:55:18 +02:00

fichinter.php

Fix: add generic doc and uniformize code

2014-09-25 12:07:11 +02:00

geoipmaxmind.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

ihm.php

Add MAIN_DEFAULT_WORKING_DAYS and MAIN_DEFAULT_WORKING_HOURS into

2014-08-08 10:44:10 +02:00

index.php

Move language key into admin.lang file

2014-09-08 21:51:40 +02:00

ldap_contacts.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

ldap_groups.php

Fix: gidNumber ldap attribute was not defined i using posixGroup objectClass

2014-09-23 00:13:51 +02:00

ldap_members.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

ldap_users.php

Migrated old error notifications to the """new""" system

2014-07-20 01:09:43 +02:00

ldap.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

limits.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-09-02 13:46:47 +02:00

livraison.php

Fix: add generic doc and use doc dir instead pdf

2014-09-25 12:44:57 +02:00

mailing.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

mailman.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

mails.php

Migrated old error notifications to the """new""" system

2014-07-20 01:09:43 +02:00

menus.php

Migrated old error notifications to the """new""" system

2014-07-20 01:43:46 +02:00

modules.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

notification.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

order_extrafields.php

Fix : [ bug #1549 ] Itïs not possible add ExtraFields

2014-08-06 17:38:44 +02:00

orderdet_extrafields.php

Fix : [ bug #1549 ] Itïs not possible add ExtraFields

2014-08-06 17:38:44 +02:00

pdf.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

perms.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

prelevement.php

Fix several bugs reported by scrutinizer

2014-09-19 14:57:31 +02:00

propal.php

Fix: use "doc" instead "pdf" dir and uniformize code

2014-09-29 11:08:50 +02:00

proxy.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

salaries.php

Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6

2014-09-21 20:30:55 +02:00

security_other.php

Change method

2014-08-14 16:06:43 +02:00

security.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

sms.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

spip.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

stock.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

supplier_invoice.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-10 08:45:08 +02:00

supplier_order.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-10 08:45:08 +02:00

supplierinvoice_extrafields.php

Fix : [ bug #1549 ] Itïs not possible add ExtraFields

2014-08-06 17:38:44 +02:00

supplierorder_extrafields.php

Fix : [ bug #1549 ] Itïs not possible add ExtraFields

2014-08-06 17:38:44 +02:00

syslog.php

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

taxes.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

translation.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

triggers.php

Fix several bugs reported by scrutinizer

2014-09-19 14:57:31 +02:00

user.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

workflow.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00