Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
db2dee7c03435e9e04ece8466046904555afccf4
dolibarr-fork/htdocs/core/modules
History
Laurent Destailleur ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
..
action
Merge remote-tracking branch 'origin/3.6' into develop
2014-11-05 16:37:07 +01:00
barcode
Uniformize code: property "nom" for thirdparty is aliased into "name"
2014-10-04 17:20:17 +02:00
cheque
Merge remote-tracking branch 'origin/3.6' into develop
2014-09-28 02:14:32 +02:00
commande
Fix some pdf differences
2015-02-03 13:43:37 +01:00
contract
Fixed: [ bug #1767 ] Contract document is not generated properly
2014-12-28 18:10:41 +01:00
dons
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
expedition
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-02-10 21:33:43 +01:00
export
Add cache excel export on harddrive with
2014-09-29 10:16:48 +02:00
facture
Merge remote-tracking branch 'origin/3.6' into 3.7
2014-11-28 02:20:01 +01:00
fichinter
Fix some pdf differences
2015-02-03 13:43:37 +01:00
import
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-02-10 21:33:43 +01:00
livraison
Fix: Show sender Country on PDF docs
2014-11-25 14:26:45 +01:00
mailings
Uniformize code: property "nom" for thirdparty is aliased into "name"
2014-10-04 17:20:17 +02:00
member
Fix bad operator for and
2015-02-03 13:05:28 +01:00
printsheet
Fix bad operator for and
2015-02-03 13:05:28 +01:00
product
Uniformize code: property "nom" for thirdparty is aliased into "name"
2014-10-04 17:20:17 +02:00
project
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
propale
Merge remote-tracking branch 'origin/3.6' into 3.7
2014-11-28 02:20:01 +01:00
rapport
Merge remote-tracking branch 'origin/3.6' into develop
2014-09-28 02:14:32 +02:00
security
Fix: checkstyle
2014-11-05 16:23:10 +01:00
societe
Uniformize code: property "nom" for thirdparty is aliased into "name"
2014-10-04 17:20:17 +02:00
supplier_invoice
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-01-18 17:13:42 +01:00
supplier_order
Fixed approve during validation if user has permission
2015-01-25 00:59:46 +01:00
syslog
Fix: the syslog handler for chromphp an fiefoxphp was not visible when
2015-02-07 19:30:28 +01:00
DolibarrModules.class.php
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-01-18 17:13:42 +01:00
index.html
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
modAccounting.class.php
FIXED Accountancy clean code
2015-02-03 06:39:44 +01:00
modAdherent.class.php
Introduce warning to remind to do a backup before migration.
2015-01-25 22:29:36 +01:00
modAgenda.class.php
Some fix with export definition. Works now with pgql too.
2014-10-12 01:59:21 +02:00
modBanque.class.php
Some fix with export definition. Works now with pgql too.
2014-10-12 01:59:21 +02:00
modBarcode.class.php
Barcode: fixed wrong menu
2014-05-19 14:38:26 +02:00
modBookmark.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modCashDesk.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modCategorie.class.php
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
modClickToDial.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modCommande.class.php
Uniformize and clean boxes behaviour and translation.
2014-10-27 21:48:28 +01:00
modComptabilite.class.php
Delete elements have a link with old module ventilation - Replace today by module Accounting Expert
2014-09-19 05:55:54 +02:00
modContrat.class.php
Some fix with export definition. Works now with pgql too.
2014-10-12 01:59:21 +02:00
modCron.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modDeplacement.class.php
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
2015-01-18 03:12:46 +01:00
modDocument.class.php
Fix: [ bug #1364 ] Duplicate Id on permission
2014-05-06 23:27:44 +02:00
modDon.class.php
Fix: bad indice
2014-06-27 01:34:27 +02:00
modECM.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modExpedition.class.php
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
modExport.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modExternalRss.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modExternalSite.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modFacture.class.php
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
modFckeditor.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modFicheinter.class.php
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
modFournisseur.class.php
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
modFTP.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modGeoIPMaxmind.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modGravatar.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modHoliday.class.php
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
modImport.class.php
Qual: remove PHP closing tag (again)
2014-05-26 13:51:25 +02:00
modLabel.class.php
Divers
2014-06-16 06:17:46 +02:00
modLdap.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modMailing.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modMailmanSpip.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modMargin.class.php
Fixed: Bad permission
2014-11-29 20:50:05 +01:00
modNotification.class.php
Qual: remove PHP closing tag (again)
2014-05-26 13:51:25 +02:00
modOpenSurvey.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modPaybox.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modPaypal.class.php
Qual: remove PHP closing tag (again)
2014-05-26 13:51:25 +02:00
modPrelevement.class.php
Qual: remove PHP closing tag (again)
2014-05-26 13:51:25 +02:00
modPrintIPP.class.php
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
2014-12-04 13:20:56 +01:00
modProduct.class.php
Solve fixme.
2014-10-03 02:00:50 +02:00
modProductBatch.class.php
Fixed: bug into produc batch management
2014-12-09 14:03:10 +01:00
modProjet.class.php
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
modPropale.class.php
Uniformize export profiles.
2014-09-22 21:46:46 +02:00
modResource.class.php
Move module to status development
2014-05-14 12:27:09 +02:00
modSalaries.class.php
Merge remote-tracking branch 'origin/3.6' into develop
2014-09-28 02:14:32 +02:00
modService.class.php
Solve fixme.
2014-10-03 02:00:50 +02:00
modSkype.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modSociete.class.php
Fix: phpunit test
2014-08-28 16:59:10 +02:00
modStock.class.php
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
modSyncSupplierWebServices.class.php
Fix CRLF
2014-11-30 15:24:39 +01:00
modSyslog.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modTax.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modUser.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modWebServices.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00
modWorkflow.class.php
Removed closing php tag
2014-05-03 18:18:44 +02:00