Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

624 Commits

Author SHA1 Message Date
Laurent Destailleur
1249e597d4 Fix test param $id 2018-09-03 11:56:05 +02:00
Frédéric FRANCE
02b74afe5f function Comment Missing 2018-08-31 22:41:51 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Daniel Berteaud
f4bfd8704d Sync rfc2307 group membership from LDAP 
With rfc2307 LDAP scheme, group members are listed in the memberUid attribute, as simple uid, not as full DN like rfc2307bis, or AD-style groups
 2018-06-21 10:21:18 +02:00
Laurent Destailleur
118d22cf1e Fix date format 2018-06-17 12:07:11 +02:00
Laurent Destailleur
54fc711a6b Add tool 2018-06-07 20:22:58 +02:00
Laurent Destailleur
15a4cdcc9c Better log 2018-06-07 13:47:32 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2018-04-23 23:09:53 +02:00
Laurent Destailleur
00c8ea6c31 better message 2018-04-23 16:52:50 +02:00
Laurent Destailleur
4aa822d0f6 better message 2018-04-23 16:49:27 +02:00
Laurent Destailleur
77d9ff033a FIX cron script disabled if module disabled 2018-04-23 15:07:27 +02:00
Laurent Destailleur
01f76d0e08 FIX cron script disabled if module disabled 2018-04-23 15:06:30 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
0223d54107 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs

Conflicts:
	htdocs/cron/list.php
 2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs
 2018-04-05 12:36:14 +02:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Alexis ALGOUD
35002cf93d Merge branch 'develop' into NEW_price_on_stock_mvt 2018-03-05 17:45:27 +01:00
alexis Algoud
ce2fc28d80 FIX migration script for product photo 2018-03-02 16:12:58 +01:00
Laurent Destailleur
6afa12773d Fix syntax error 2017-12-12 15:04:31 +01:00
Laurent Destailleur
dd4b3081c5 Module builder 2017-12-11 14:11:19 +01:00
Laurent Destailleur
338f8d978a Fix generation of doc in modulebuilder 2017-12-11 13:50:26 +01:00
Laurent Destailleur
f7b663379a Fix PHP 7.2 2017-12-10 21:04:59 +01:00
Laurent Destailleur
ff9a62e519 Fix trackid from emailings 2017-11-21 11:15:33 +01:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
Laurent Destailleur
d404d8be9f Debug to make MAIN_ODT_AS_PDF workign with unoconv 2017-10-10 18:54:30 +02:00
Laurent Destailleur
084dc7798d Standardize use of function getCommonSubstitutionArray 2017-10-09 14:51:42 +02:00
Laurent Destailleur
1fd712d712 Fix help 2017-10-09 10:59:39 +02:00
Laurent Destailleur
c06a78145c Rename function to avoid duplicate 2017-10-06 01:27:41 +02:00
Regis Houssin
791c385e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/adherents/card.php
 2017-09-22 20:26:22 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Regis Houssin
1f88e624c2 Fix: add ldap import/export script 2017-09-17 10:42:00 +02:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00
Laurent Destailleur
206d46cbb7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	scripts/cron/cron_run_jobs.php
 2017-08-22 11:18:17 +02:00
Laurent Destailleur
749355abc2 Update cron_run_jobs.php 2017-08-22 10:41:30 +02:00
Eric Seigne
64aed24539 remove comment 2017-08-20 09:45:11 +02:00
Eric Seigne
b77fe285dc fix 'Error cronjob->run_job: Permission denied' and add time and login used for debug helps 2017-08-20 09:39:51 +02:00
Laurent Destailleur
ddd60d1cd2 Fix error counting in cron 2017-08-03 11:23:23 +02:00
Laurent Destailleur
747719b3e8 Code comment 2017-08-01 15:54:28 +02:00
Laurent Destailleur
f9dc628f0b Add tool to fix missing thumbs 2017-08-01 15:53:22 +02:00
Laurent Destailleur
caaeac35b6 Work on modulebuilder 2017-07-17 00:02:04 +02:00
Laurent Destailleur
e5513cff91 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2017-07-15 21:24:21 +02:00
Laurent Destailleur
4e45c7fdba Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-15 21:21:40 +02:00
Maxime Kohlhaas
f166c96ed5 Fix : script to migrate photo path 2017-07-09 13:09:17 +02:00
Laurent Destailleur
a8afa547f0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
 2017-05-17 15:20:17 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
1a016524e0 Fix log 2017-05-12 17:44:51 +02:00
Laurent Destailleur
c673d283e0 Fix script to send emailings 2017-05-02 18:21:50 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00