Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

72480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a8009d4a72 Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources 
FIX Work with new table actioncomm_resources and multiple contact affectation
 2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76 Update company.lib.php 2018-12-01 16:15:34 +01:00
Inovea Conseil
0ba5fda3da Update price.php 2018-12-01 16:11:49 +01:00
Laurent Destailleur
3b4ee295f3 Merge pull request #10129 from simnandez/8.0 
Fix #9929
 2018-12-01 15:58:38 +01:00
Inovea Conseil
8964ec7ea1 Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Laurent Destailleur
07713ca08e Merge pull request #10103 from laudeco/feature/fix_docker_creation 
fix docker image creation + adding the support of xdebug
 2018-12-01 15:54:56 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
Laurent Destailleur
6076976e3b Merge pull request #10128 from grandoc/new_branch_01_12_2018 
fix scrutinizer issue : The variable  seems only to be defined at a l…
 2018-12-01 15:48:38 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
Laurent Destailleur
5c755b6f9f Merge pull request #10095 from ptibogxiv/patch-97 
Fix duration display product/service  in list.php
 2018-12-01 15:14:57 +01:00
Laurent Destailleur
778547818d Merge pull request #10108 from frederic34/patch-2 
Avoid adding libs not compatible with php 5.4
 2018-12-01 15:09:25 +01:00
Laurent Destailleur
5d3575ab4d Merge pull request #10126 from atm-florian/develop 
fix scrutinizer
 2018-12-01 15:08:45 +01:00
Laurent Destailleur
03f0922325 Merge pull request #10087 from AurelGDN/develop 
New Takepos: cheque payment button in cashdesk
 2018-12-01 15:03:19 +01:00
Laurent Destailleur
03a67cee99 Merge pull request #10113 from frederic34/patch-9 
llx_paiementfourn.sql #8723
 2018-12-01 14:54:57 +01:00
Laurent Destailleur
305ab85f5d Merge pull request #10114 from frederic34/patch-17 
Update 6.0.0-7.0.0.sql #8723
 2018-12-01 14:54:31 +01:00
Laurent Destailleur
358be875e4 Merge pull request #10120 from defrance/patch-127 
scrutinizer major error
 2018-12-01 14:49:50 +01:00
Laurent Destailleur
b8e3aaa3cb Merge pull request #10121 from defrance/patch-128 
scrutinizer major error
 2018-12-01 14:49:28 +01:00
Laurent Destailleur
915b1b9528 Merge pull request #10124 from atm-john/fix_issue_from_scrutinizer 
Fix issue from scrutinizer
 2018-12-01 14:49:14 +01:00
Laurent Destailleur
60610ca49d Merge pull request #10119 from simnandez/8.0 
Fix #10097
 2018-12-01 14:48:39 +01:00
florian HENRY
8e38d24121 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-12-01 14:43:32 +01:00
florian HENRY
47eda86e2f fix scrutinizer 2018-12-01 14:39:04 +01:00
Laurent Destailleur
30ed180dd4 Merge pull request #10122 from defrance/patch-129 
scrutinizer major error correction
 2018-12-01 14:29:42 +01:00
Laurent Destailleur
06e16d510c Merge pull request #10123 from defrance/patch-130 
scrutinizer error update
 2018-12-01 14:29:02 +01:00
ATM John BOTELLA
c6f4879575 Fix issue from scrutinizer 2018-12-01 12:04:34 +01:00
BENKE Charlene
676ac67817 scrutinizer error update 2018-12-01 11:49:25 +01:00
BENKE Charlene
1f91a763ff scrutinizer major error correction 
It seems like $tasksarray can also be of type string. However, the property $lines is declared as type array<integer,object<Task>>. Maybe add an additional type check?
 2018-12-01 11:44:46 +01:00
Frédéric FRANCE
9a9a963703 Update .travis.yml 2018-12-01 11:41:04 +01:00
Frédéric FRANCE
07da468109 Update modDav.class.php 2018-12-01 11:39:58 +01:00
BENKE Charlene
fca332995b scrutinizer major error 2018-12-01 11:37:50 +01:00
BENKE Charlene
c34b213f61 scrutinizer major error 2018-12-01 11:33:58 +01:00
Juanjo Menent
6104d16b08 Merge pull request #10117 from atm-maxime/fix_pdf_contract 
Fix pdf strato for contract with multipage
 2018-12-01 11:14:38 +01:00
Juanjo Menent
1c04c2b5f4 Fix #10097 2018-12-01 10:38:40 +01:00
Juanjo Menent
163f67d600 Merge pull request #10115 from atm-florian/8.0 
fix #10006
 2018-12-01 08:57:23 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
florian HENRY
cddb6e0c47 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0 2018-12-01 00:40:12 +01:00
florian HENRY
38059ed60d fix #10006 2018-12-01 00:39:37 +01:00
Frédéric FRANCE
335327827d Update 6.0.0-7.0.0.sql 2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c Update 5.0.0-6.0.0.sql 2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911 Update llx_paiementfourn.sql 2018-12-01 00:26:51 +01:00
Juanjo Menent
0e1c4d92da Merge pull request #10112 from inoveaconseil/patch-2 
Fix missing translation
 2018-11-30 23:59:29 +01:00
Juanjo Menent
ace14434e9 Merge pull request #10111 from atm-florian/8.0 
fix #10069
 2018-11-30 23:58:16 +01:00
Juanjo Menent
d1df592c7e Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen 
Fix #9074
 2018-11-30 23:57:49 +01:00
Juanjo Menent
859d6c4401 Merge pull request #10109 from atm-maxime/fix_dupl_code 
Fix #9070
 2018-11-30 23:57:32 +01:00
Juanjo Menent
6d8f3aedc3 Merge pull request #10107 from atm-maxime/fix_import_extrafields 
Fix extrafields in import tool
 2018-11-30 23:56:57 +01:00
Juanjo Menent
a57a43fc05 Merge pull request #10104 from inoveaconseil/MassClose 
FIX mass action closed proposal
 2018-11-30 23:56:38 +01:00
Juanjo Menent
70d75caf09 Merge pull request #10096 from ptibogxiv/patch-98 
Fix trans
 2018-11-30 23:54:36 +01:00
Inovea Conseil
6201962dcf Fix missing translation 2018-11-30 23:27:05 +01:00
florian HENRY
7a182c7880 fix #10069 2018-11-30 23:25:44 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Maxime Kohlhaas
7585461486 Fix #9070 2018-11-30 22:16:17 +01:00