Commit Graph

518 Commits

Author SHA1 Message Date
Speed
5715233fb0 Updated script sync members from LDAP
Replace "Cotisation" class with its new name "Subscription"
2017-01-20 18:07:53 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
15351a5a51 Fxi firstadmin param must take first active admin 2016-11-06 18:20:27 +01:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
17d9c15825 Better error message 2016-09-29 14:02:54 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
e10c89fba8 More log to help debug 2016-09-10 12:30:01 +02:00
Laurent Destailleur
8d3adfd1c9 Fix 2016-09-10 12:22:23 +02:00
Laurent Destailleur
d821df070b Fix multicompany: recurring invoice must be in same env than template. 2016-09-10 04:33:23 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
Laurent Destailleur
dc9c2f0ed7 FIX #5687 2016-09-02 21:10:46 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
4215ec3ca9 FIX usage of sepa generation setup. 2016-08-28 20:12:25 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
16e3a3d294 Fix datadir not defined
Fix can't use the cron script on cloud services since the admin user may
have different values.
2016-07-06 22:49:08 +02:00
Laurent Destailleur
1e9cee1b07 Fix bug reported by scrutinizer 2016-06-29 11:48:28 +02:00
Juanjo Menent
8f617b196a Fix printing following the rules 2016-06-04 15:51:28 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
e9ffbd1406 FIX When an email was partially sent from GUI, it was not possible to
finish from CLI.
2016-02-12 14:27:59 +01:00
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
Laurent Destailleur
20f1455090 FIX #4314 2016-01-08 15:45:23 +01:00
Laurent Destailleur
a4edd90320 Debug the cron module 2015-12-19 03:27:55 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
2015-12-13 21:34:36 +01:00
Laurent Destailleur
a8d28b5e46 NEW Add a filter field to restrict list of member when doing a LDAP list
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
2015-10-30 19:23:23 +01:00
Laurent Destailleur
75eae394f1 Fix confirmation of scripts make scripts not working with cron 2015-09-12 11:36:06 +02:00
Laurent Destailleur
6318b12aeb Fix confirmation of scripts make scripts not working with cron 2015-09-11 20:36:45 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
aspangaro
b6958bb592 Wrong address 2015-06-15 05:22:50 +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
f0257d02b5 Minor fix 2015-06-01 16:31:25 +02:00
jean
659570a6ab add a script for migrating pictures of products 2015-05-04 11:56:02 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended
through a script parameter
2015-04-18 16:39:53 +02:00
Laurent Destailleur
10f967e07a FIX #2519 2015-04-02 11:11:03 +02:00
Laurent Destailleur
29fc2652e1 FIX #2519 2015-04-02 11:00:37 +02:00
Laurent Destailleur
4781707fa4 Fix jodconverter can't work without the wrapper jodconverter. 2015-02-22 16:01:01 +01:00
Laurent Destailleur
d5ec19ef83 Enhance help when running cron script from command line 2015-02-11 13:21:12 +01:00
Laurent Destailleur
2e3400a039 Enhance help when running script from command line 2015-02-11 12:29:39 +01:00
Laurent Destailleur
0ca1647e11 Fixed: Removed bad commited dir 2015-01-23 01:52:56 +01:00
Laurent Destailleur
4aa4f5f5e9 Merge remote-tracking branch 'origin_dolibarr/develop' into develop 2015-01-22 23:14:40 +01:00
Emmanuel Haguet
296d947bd2 Corrections (fichier, calcul de ref) 2015-01-21 16:25:13 +01:00