Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

15786 Commits

Author SHA1 Message Date
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Laurent Destailleur
a49a083629 Merge pull request #10142 from atm-maxime/fix_import_fk_dept 
Fix add missing fk_department and fk_pays in contact/bank imports
 2018-12-01 17:14:27 +01:00
Maxime Kohlhaas
13806124b2 Fix add missing fk_department and fk_pays in contact/bank imports 2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468 fix travis 2018-12-01 17:10:06 +01:00
Juanjo Menent
642a86ba25 Fix #8152 2018-12-01 16:55:45 +01:00
Maxime Kohlhaas
8c13c87429 Fix path for user photo 2018-12-01 16:55:42 +01:00
florian HENRY
6236f727c9 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-01 16:51:51 +01:00
florian HENRY
c422904b99 fix #9964 2018-12-01 16:51:40 +01:00
Inovea Conseil
18281d9d43 FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Maxime Kohlhaas
748dd12e4d Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
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
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
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
30ed180dd4 Merge pull request #10122 from defrance/patch-129 
scrutinizer major error correction
 2018-12-01 14:29:42 +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
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
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
Laurent Destailleur
539d993666 Fix translation of month 2018-11-29 12:20:47 +01:00
Laurent Destailleur
bbfd134733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390 Merge pull request #10090 from hregis/8.0_bug3 
FIX remove constant for avoid problem
 2018-11-29 11:18:29 +01:00
Laurent Destailleur
950dfeef58 Merge pull request #10081 from oscim/patch-1 
Update company.lib.php
 2018-11-29 11:15:52 +01:00
Laurent Destailleur
f3ce49806d Update company.lib.php 2018-11-29 11:15:27 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Laurent Destailleur
ef3a280f40 Merge pull request #10082 from grandoc/new_branch_26_11_2018 
fix typo error
 2018-11-29 10:57:48 +01:00
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Regis Houssin
b4aa9ee335 FIX remove constant for avoid problem 2018-11-28 17:04:42 +01:00
Laurent Destailleur
b9c08853be CSS 2018-11-28 16:54:21 +01:00
Marc de Lima Lucio
c13cc5d697 FIX: form actions: select_type_actions could be too small + bad init 2018-11-28 15:46:27 +01:00
Laurent Destailleur
01181ba3a4 Fix avoid warning 2018-11-28 13:06:39 +01:00
Laurent Destailleur
780a538fe0 Fix multicompany not accessible from website. 2018-11-27 17:37:39 +01:00
Laurent Destailleur
70bd931d08 FIX empty page due to preg_replace JIT error on large strings 2018-11-27 16:20:31 +01:00
Laurent Destailleur
7c22504252 Fix position of field must be ssame between create/edit/view 2018-11-27 09:22:59 +01:00
Laurent Destailleur
b9e544d291 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/resource/list.php
 2018-11-26 23:08:06 +01:00
Philippe GRAND
52f587e1e3 merging 2018-11-26 16:05:53 +01:00
oscim
f5ebcca475 error space after comment 2018-11-26 15:47:51 +01:00