lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,843 Commits 43 Branches 150 Tags 886 MiB
09b61fd185
Commit Graph

1921 Commits

Author SHA1 Message Date
Florian HENRY
a96b92a618 FIX : Email selector contact must not include inactive contact 2015-09-30 14:06:45 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
philippe
1454d942ef missing translation 2015-09-27 11:06:45 +02:00
Laurent Destailleur
d119e04963 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 14:17:02 +02:00
Laurent Destailleur
9ecc8e5e6b FIX Regression on bad use of fk_account showing the bad bank account on 
PDF.
 2015-09-26 14:11:39 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Laurent Destailleur
f3ba115ef0 Fix missing default value 2015-09-26 10:53:59 +02:00
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +02:00
Juanjo Menent
f14c806439 Merge branch 'develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-26 09:03:50 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
3feffdb84f [Qual] Removed unused deprecated fields 2015-09-24 17:50:39 +02:00
Juanjo Menent
5dc78a337d Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-09-23 22:49:23 +02:00
Juanjo Menent
342e3413db Issue 3509: Init works 2015-09-23 22:48:48 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
 2015-09-23 00:34:57 +02:00
Laurent Destailleur
c2bdd9b465 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-22 11:29:49 +02:00
Laurent Destailleur
7d4a9b17b6 FIX Creation of tables or keys must not be done with a random order. 2015-09-21 14:00:02 +02:00
aspangaro
49f671eb1d Correct name 2015-09-19 07:24:32 +02:00
aspangaro
1901b2fb3b Missing translations in checks deposits exports 2015-09-19 07:15:13 +02:00
Laurent Destailleur
f01b9c09a3 Removed duplicate code. Use inheritance instead. 2015-09-18 10:36:23 +02:00
Laurent Destailleur
1b836dc31e Merge pull request #3408 from aspangaro/develop-60 
New: CkEditor add possibility to choose skin
 2015-09-15 17:09:11 +02:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
97096536b1 Fix #2526 The filter on type numeric is ok now. Sometimes we used 
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
 2015-09-12 15:20:55 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-09-12 11:50:46 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
24a216b154 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-12 11:33:49 +02:00
Laurent Destailleur
5e81eb7586 Merge pull request #3505 from GPCsolutions/firephp 
Setup FirePHP like ChromePHP
 2015-09-12 11:02:31 +02:00
Raphaël Doursenaud
fc91e553ad Setup FirePHP like ChromePHP 2015-09-11 17:45:30 +02:00
Laurent Destailleur
4b97fae28f Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-11 07:52:06 +02:00
Laurent Destailleur
7951483c5f Fix: examples ko for import 
Fix bad picto for export
 2015-09-10 12:47:25 +02:00
Florian HENRY
6cb993c0b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-10 11:20:03 +02:00
aspangaro
3a90bfa6d3 Merge remote-tracking branch 'Upstream/develop' into develop-60 2015-09-10 06:59:23 +02:00
Laurent Destailleur
2234d95a7b Merge pull request #3481 from grandoc/develop 
translations missing
 2015-09-09 20:52:36 +02:00
Laurent Destailleur
a726cd210b Merge pull request #3483 from GPCsolutions/sentry 
Fix regression introduced by f3c71a9a5a
 2015-09-09 20:10:01 +02:00
Laurent Destailleur
8c1760fbcf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-09-09 13:26:35 +02:00
Laurent Destailleur
d3f1a7d5b8 FIX Bad condition into invoice export request making reporting too many 
rows.
 2015-09-09 13:26:10 +02:00
Florian HENRY
89b723b2a7 FIX : multientity warehouse management 2015-09-08 16:23:00 +02:00
aspangaro
16585553c1 Merge remote-tracking branch 'Upstream/develop' into develop-64 2015-09-07 21:52:08 +02:00
aspangaro
46b0e259b1 Add constant in modAccounting.class.php 2015-09-07 21:51:48 +02:00
philippe grand
706f62d8f2 better display for code 2015-09-07 17:02:53 +02:00
Raphaël Doursenaud
1168f0b6ae Fix regression introduced by f3c71a9a5a 2015-09-07 16:20:17 +02:00
philippe grand
ec21916d3b translations missing 2015-09-07 15:55:26 +02:00
philippe grand
9532baf0e5 translations missing 2015-09-07 15:46:57 +02:00
philippe grand
887a4107a1 translations missing 2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714 translations missing 2015-09-07 15:29:51 +02:00
Laurent Destailleur
5d285bf56d Merge pull request #3478 from grandoc/develop 
translations missing
 2015-09-07 15:09:31 +02:00
philippe grand
ff3968b07f translations missing 2015-09-07 12:46:49 +02:00
Laurent Destailleur
28c62fb214 Introduce a function to return a warning by loggers. 2015-09-07 12:21:26 +02:00
Laurent Destailleur
f3c71a9a5a Dolibarr must not contains autoload feature. 
The developer and user must decide which lib is used and it must not be
a random feature that take a library "randomly" (first one found is same
a randomly found).
By default, library embedded of dolibarr must be used. If we want to use
another one, an option to set the path of external libray must be
available.
 2015-09-07 12:09:42 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
Laurent Destailleur
51c5e01290 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-05 00:48:56 +02:00
Laurent Destailleur
7926fd8083 NEW ODT generators can set meta properties of ODT file 2015-09-05 00:47:06 +02:00
Raphaël Doursenaud
7bb917e637 NEW Support logging to a Sentry server 
Sentry is an Open Source error logging and aggregation platform.
It can be used on-premise or hosted at https://getsentry.com
 2015-09-04 19:10:13 +02:00
Raphaël Doursenaud
11402debbd Install ChromePHP from composer 2015-09-04 19:06:00 +02:00
Laurent Destailleur
dcaef54f9b Fix can't disable a module that were removed. 2015-09-04 16:47:43 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Laurent Destailleur
2e3d25c055 Merge pull request #3462 from grandoc/3.7 
fix : Typo
 2015-09-03 19:15:31 +02:00
Laurent Destailleur
54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3383

Conflicts:
	ChangeLog
 2015-09-03 19:12:01 +02:00
philippe grand
8bf093a7ce fix : Typo 2015-09-03 12:12:10 +02:00
Marcos García de La Fuente
67b7162c59 Merge branch '3.7' into bug-3383 
# Conflicts:
#	ChangeLog
 2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29 Merge branch '3.7' into bug-incorrect-pdf-bank 
# Conflicts:
#	ChangeLog
 2015-09-03 12:03:24 +02:00
Laurent Destailleur
19ac160696 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_prospect.php
	htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
	htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansextralight.z
	htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmono.z
	htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonob.z
	htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
	htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
 2015-09-03 10:49:41 +02:00
Marcos García de La Fuente
3134950dbe FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models 
Close #3383
 2015-09-01 11:19:05 +02:00
Marcos García de La Fuente
c4f9bde14d FIX [ bug #3431 ] Invoice bank account is not respected 
Close #3431
 2015-09-01 11:09:37 +02:00
Raphaël Doursenaud
3b493ab0ed Fix #2863 Sensible defaults for ChromePHP path 
Use the provided ChromePHP class by default
 2015-08-31 21:08:37 +02:00
Laurent Destailleur
302b61c5ce Fix Can't download generated document for cheque summary deposit. 2015-08-27 22:43:09 +02:00
Juanjo Menent
ddb9c6a025 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 21:01:39 +02:00
Juanjo Menent
0a33f0728a Fix translations of contract exports 2015-08-26 21:01:01 +02:00
Juanjo Menent
4cd61073e2 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 20:26:27 +02:00
Juanjo Menent
6321e96e49 Close #3223 2015-08-26 20:25:52 +02:00
Laurent Destailleur
603c44c37c Merge pull request #3405 from aspangaro/3.8-13 
Fast review 3.8
 2015-08-26 11:27:16 +02:00
Juanjo Menent
9deaa3cceb Merge remote-tracking branch 'origin/3.8' into develop 2015-08-25 22:01:33 +02:00
Juanjo Menent
f32a7ba228 Close #3224 2015-08-25 21:59:46 +02:00
aspangaro
73d8f20c6b Fix: Correct directory where the donation is generated & add the action to remove_file who are generated 2015-08-25 08:09:14 +02:00
Laurent Destailleur
feed3f714c Fix to avoid warning 2015-08-24 11:17:11 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
Laurent Destailleur
1b409538a8 Fix #3400 
Conflicts:
	htdocs/core/lib/date.lib.php
 2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac Fix #3400 2015-08-20 15:50:00 +02:00
Florian HENRY
91c8057d51 NEW : import Third parties/Sales representatives 2015-08-19 16:59:43 +02:00
Laurent Destailleur
fabd751be4 Fix Server hang with long loop when reading specimen pdf and high number 
of tasks.
 2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f Fix translation 2015-08-17 19:42:19 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Laurent Destailleur
f1e87478ff Fix translation of printing menu 2015-08-12 23:12:15 +02:00
Laurent Destailleur
d4aabf99db Fix permission of module 2015-08-12 22:32:29 +02:00
Juanjo Menent
a6d7977d4f Merge pull request #3354 from defrance/patch-74 
New pdf for project - listing of elements
 2015-08-10 20:51:58 +02:00
Marcos García de La Fuente
f3ef4fed93 Fix: [ bug #3313 ] Error enabling module with PostgreSQL database 
Close #3313
 2015-08-09 13:58:03 +02:00
Juanjo Menent
f695b5cd11 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 13:01:53 +02:00
Juanjo Menent
38afb1a4e6 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/modules/modBarcode.class.php
 2015-08-07 12:57:16 +02:00
Juanjo Menent
12b83fd3e8 Fix #3304 2015-08-07 12:45:27 +02:00
BENKE Charlie
01671d02d1 New pdf for project - listing of elements 2015-08-07 00:39:44 +02:00
Juanjo Menent
98072ec73e Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:00:59 +02:00
Florian HENRY
2a7f5da4a7 FIX : export SQL instruction on modProduct with extrafields 2015-08-04 11:49:26 +02:00
Juanjo Menent
9ae31f3a08 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:01:19 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/resultat/clientfourn.php
 2015-07-30 15:07:22 +02:00
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
fmarcet
6676114501 Fix: Not showing product supplier reference when page break 2015-07-27 16:31:40 +02:00
fmarcet
e130af8033 Fix: Not showing delivery date on rouget pdf (expedition) 2015-07-27 13:11:07 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
Juanjo Menent
06684ea362 Merge pull request #3250 from aspangaro/3.8-patch7 
Fix: #3228 [Export] Missing member ID field in users
 2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531 Merge pull request #3249 from aspangaro/3.8-patch6 
Fix: #3230 [Leaves] Module setup page is useless
 2015-07-17 19:15:31 +02:00
aspangaro
a0d74cc1a1 Fix: #3228 [Export] Missing member ID field in users 2015-07-16 22:50:50 +02:00
aspangaro
440e144892 Fix: #3230 [Leaves] Module setup page is useless 2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0 Fix: #3232 [Agenda] Setup page tab order is weird 2015-07-16 22:16:11 +02:00
Laurent Destailleur
cbce66bba8 Merge pull request #3190 from hregis/3.8_bug2 
Fix: wrong path and add index.html
 2015-07-16 10:07:31 +02:00
aspangaro
4ae15adc69 Fix: wrong link on leave tabs in user card 2015-07-16 06:10:51 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Regis Houssin
f23afc3453 Fix: wrong path and add index.html 2015-07-13 10:07:38 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Laurent Destailleur
688562a816 Fix regression: We can't yet set method __construct of DolibarrModules 
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
 2015-07-10 09:40:18 +02:00
Maxime Kohlhaas
9f9ba12802 New : option to allow credit note without related invoice 2015-07-08 14:32:57 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
56ff0c7350 Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove 2015-07-07 13:08:12 +02:00
Laurent Destailleur
56560d9379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 10:49:01 +02:00
Regis Houssin
4273c4aad9 Fix: data can be just a value, not an array 2015-07-03 11:35:11 +02:00
Regis Houssin
b70dfd0d54 New: possibility to defined a tab for all entities in module descriptor 2015-07-03 11:16:24 +02:00
Regis Houssin
4fb5af7442 Fix: reset the current entity 2015-07-03 10:58:55 +02:00
Laurent Destailleur
312281f4d4 Debug askpricesupplier 
Try to continue work on position of menu entries.
 2015-07-02 22:43:51 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
c218843cdb FIX Save of filters into export profiles failed. 2015-06-24 18:29:29 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
Laurent Destailleur
0780c84012 Fix missing payment mode into export invoice profile 2015-06-23 23:58:04 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
phf
06962cb4e6 FIX : tool export handle the type "select" extrafields and return the value instead of id 2015-06-23 16:26:05 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
aspangaro
20582b9ea5 Merge remote-tracking branch 'Upstream/develop' into develop-36 2015-06-21 07:31:43 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
Marcos García de La Fuente
a496606826 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/soc.php
 2015-06-13 02:45:42 +02:00
Laurent Léonard
a337b6f874 Rename "duree" property of interventions to "duration" 
This also fixes the display problem of total duration on the "soleil" document model
 2015-06-11 23:18:29 +02:00
Regis Houssin
edd5c33c5b Fix: Strict standards: Only variables should be passed by reference 
http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference
 2015-06-10 18:22:47 +02:00
aspangaro
592d124f26 Merge remote-tracking branch 'Upstream/develop' into develop-28 2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976 NEW: Add a tab document in donation card 2015-06-08 21:28:32 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
7e3a457f85 Merge pull request #2942 from aspangaro/develop-donation 
Fix: Donation error on admin tab & Fix: Input disabled by default
 2015-06-05 15:57:35 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22 
Fix: wrong file & problem to install model
 2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
Laurent Destailleur
4adeb8980d NEW Add ref and label of project into export 2015-06-03 16:40:02 +02:00
aspangaro
bde91633da Fix: input of french article is disabled by default 2015-06-03 06:01:05 +02:00