Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 07:51:29 +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
BENKE Charlene
044c54da94 Warning error if $conf->browser->layout is empty 2018-12-02 10:45:37 +01:00
Frédéric FRANCE
3b31354dc2 cats may be int or array 2018-12-02 10:33:23 +01:00
Frédéric FRANCE
ab02cb3cde doc comment adherent class 2018-12-02 10:12:40 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
Frédéric FRANCE
d2d623b0b6 GETPOSTISSET has only one param 2018-12-02 09:26:24 +01:00
Maxime Kohlhaas
ad05b531e7 Fix display user photo with new path 2018-12-02 00:02:43 +01:00
Maxime Kohlhaas
328787546f Merge branch 'fix_user_photo' of github.com:atm-maxime/dolibarr into fix_user_photo 2018-12-01 23:57:20 +01:00
Maxime Kohlhaas
72225f6524 Migration of user photo paths 2018-12-01 23:57:15 +01:00
Maxime Kohlhaas
09b967bb1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 23:39:28 +01:00
Laurent Destailleur
070b1d04c9 Merge pull request #10151 from frederic34/patch-17 
fix doc comment fournisseur.facture.class.php
 2018-12-01 23:06:02 +01:00
Laurent Destailleur
6f3d2e98a2 Merge pull request #10150 from frederic34/patch-9 
add log in empty catch
 2018-12-01 23:04:41 +01:00
Laurent Destailleur
c9ed381079 Merge pull request #10149 from frederic34/patch-2 
fix doc comment pdf_strato.modules.php
 2018-12-01 23:02:27 +01:00
Laurent Destailleur
0668f90e14 Merge pull request #10146 from atm-maxime/fix_ecm_expensereport 
Fix expense report in ecm auto dir
 2018-12-01 23:02:09 +01:00
Frédéric FRANCE
9692e98acf Update fournisseur.facture.class.php 2018-12-01 22:49:12 +01:00
Frédéric FRANCE
471ea35d6c add log in empty catch 2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08 Update pdf_strato.modules.php 2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68 Update pdf_strato.modules.php 2018-12-01 21:41:40 +01:00
Laurent Destailleur
96741290ba Merge pull request #10147 from andreubisquerra/master 
Fix issues on TakePOS
 2018-12-01 20:25:45 +01:00
Maxime Kohlhaas
58e0a29d21 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 20:08:32 +01:00
andreubisquerra
8f1a00bbf1 Fix issues on TakePOS 2018-12-01 19:55:35 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +01:00
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +01:00
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
Laurent Destailleur
0fb95c91a4 Merge pull request #10141 from andreubisquerra/master 
TakeBOX now is 'TakePOS Connector'
 2018-12-01 17:14:01 +01:00
Laurent Destailleur
2ae7aa46b6 Merge pull request #10140 from frederic34/patch-20 
fix travis
 2018-12-01 17:13:21 +01:00
Laurent Destailleur
e30bee50a2 Merge pull request #10139 from atm-john/fix_#8741 
FIX #8741
 2018-12-01 17:12:55 +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
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
aurelien goudeneche
06e6d3ab00 Merge pull request #1 from Dolibarr/develop 
Fork Update
 2018-12-01 17:07:56 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Laurent Destailleur
b41e0a40e7 Merge pull request #10138 from inoveaconseil/patch-4 
FIX #6580
 2018-12-01 16:56:31 +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
Laurent Destailleur
e4bc9f8f87 Merge pull request #10136 from grandoc/8.0 
fix :#9967
 2018-12-01 16:45:37 +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
Laurent Destailleur
3d09b05338 Merge pull request #10135 from atm-florian/8.0_fix9999 
fix #9999
 2018-12-01 16:31:02 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
florian HENRY
c320dcd161 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999 2018-12-01 16:24:20 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
Laurent Destailleur
3ea69cb1f1 Merge pull request #10130 from inoveaconseil/patch-3 
Fix #9572
 2018-12-01 16:22:38 +01:00
Laurent Destailleur
508cb459eb Merge pull request #10134 from frederic34/patch-18 
devcamp 2018 fix #9642
 2018-12-01 16:21:30 +01:00
Frédéric FRANCE
61322b9ce2 devcamp 2018 fix #9642 2018-12-01 16:19:54 +01:00
Laurent Destailleur
2069223e4e Merge pull request #10133 from defrance/patch-133 
fix #9475
 2018-12-01 16:19:10 +01:00
BENKE Charlene
1dc2fc5060 fix #9475 2018-12-01 16:17:52 +01:00