lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,295 Commits 43 Branches 150 Tags 886 MiB
b063c19084
Commit Graph

64295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
782cde37b3 Merge pull request #7175 from ATM-Marc/NEW_units_import_products 
NEW add fk_unit field into product/service import/export
 2017-07-18 14:49:59 +02:00
Laurent Destailleur
b215940277 Merge pull request #7174 from atm-maxime/fix_user_from_member 
Fix : creating user from member was failing due to column size difference
 2017-07-18 14:49:33 +02:00
Laurent Destailleur
98cb1b7af1 Merge pull request #7171 from atm-ph/fix_5.0_search_lost 
Fix lost search value in list if come from thirdparty card
 2017-07-18 14:48:38 +02:00
Laurent Destailleur
f6060b976d Update list.php 2017-07-18 14:48:18 +02:00
Laurent Destailleur
7ac5054df8 Update list.php 2017-07-18 14:47:44 +02:00
Laurent Destailleur
594f08cc6f Merge pull request #7170 from aspangaro/6.0-fix7169 
Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription
 2017-07-18 14:46:42 +02:00
Laurent Destailleur
ba2dcb9221 Merge pull request #7166 from hregis/5.0_bug 
Fix: Trusty become default linux the July 18th 2017
 2017-07-18 14:45:55 +02:00
Laurent Destailleur
c59059ad9d Merge pull request #7167 from hregis/6.0_bug 
Fix: php 5.6 is ok now (travis)
 2017-07-18 14:45:26 +02:00
hguibourgdev
4b0638dd40 Update list.php 
FIX copy-paste error (sell versus buy)
 2017-07-18 14:43:03 +02:00
Laurent Destailleur
636c6ea880 Merge pull request #7163 from hguibourgdev/patch-6 
Update list.php
 2017-07-18 14:42:26 +02:00
Laurent Destailleur
b2c00ac463 Merge pull request #7161 from hguibourgdev/patch-4 
Patch 4
 2017-07-18 14:38:34 +02:00
Laurent Destailleur
9ea30c427e Merge pull request #7160 from hguibourgdev/patch-4 
Update card.php
 2017-07-18 14:36:12 +02:00
Laurent Destailleur
5e1dbdc608 Update index.php 2017-07-18 14:35:11 +02:00
Articoder InfoSec Team
0179160f6c Reason: similar change is present elsewhere in the code 
Notes: please review carefully before accepting. patch propagation. manual test run. 
Reviewed By: https://github.com/dchichkov 
Cherry picked from:
===
From 0d62bd704e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 22 Jun 2016 18:59:51 +0200
Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2017-07-18 14:34:57 +02:00
Laurent Destailleur
c10852bea3 Merge pull request #7158 from articoder-infosec/patch-1 
Reason: similar change is present elsewhere in the code.
 2017-07-18 14:33:41 +02:00
Laurent Destailleur
ba660a041c Update index.php 2017-07-18 14:33:32 +02:00
Laurent Destailleur
e19167dffa Merge pull request #7154 from atm-ph/fix_3.9_contrat_updateline_extra 
Fix updateline extrafields contrat fail
 2017-07-18 14:30:55 +02:00
Laurent Destailleur
04678f92da Merge pull request #7165 from hregis/develop_bug2 
Fix: add upgrade 6 to 7 in travis
 2017-07-18 14:29:32 +02:00
Laurent Destailleur
86926a28ec Fix css 2017-07-18 14:27:51 +02:00
Laurent Destailleur
a416ec4258 Try to fix travis 2017-07-18 14:25:07 +02:00
Laurent Destailleur
cfbd47bd78 Fix field null 2017-07-18 14:09:37 +02:00
Laurent Destailleur
5c296c679e Enhance source code editor 2017-07-18 13:42:07 +02:00
Laurent Destailleur
5f32c3d34a Work on new india vat system 2017-07-18 12:49:42 +02:00
Laurent Destailleur
97fe41d603 A info int smtp header 2017-07-18 12:49:19 +02:00
Laurent Destailleur
6db2aeff20 Fix source code editor 2017-07-18 12:00:18 +02:00
Maxime Kohlhaas
f876833b9a Fix : search on rowid don't work with pgsql and natural search 2017-07-18 10:31:35 +02:00
Marc de Lima Lucio
447fdd542d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products 2017-07-18 10:30:43 +02:00
Laurent Destailleur
cfe7216577 Removed constant PROJECT_DEFAULT_PUBLIC (become useless) 2017-07-18 10:23:25 +02:00
Marc de Lima Lucio
3a05b6a164 NEW add fk_unit field into product/service import/export 2017-07-18 10:20:16 +02:00
Maxime Kohlhaas
ce534491fd Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-07-18 10:19:11 +02:00
Maxime Kohlhaas
d35dbdea92 Change column size in sql table creation also 2017-07-18 10:16:59 +02:00
Laurent Destailleur
2a50a78497 Fix hack to solve link to restrictions 2017-07-18 10:15:48 +02:00
Maxime Kohlhaas
76eac7ce6a Fix : creating user from member was failing due to column size difference 2017-07-18 10:13:10 +02:00
Laurent Destailleur
fc53a8b576 Fxi copyright 2017-07-18 03:21:59 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
ae7f2ac253 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 20:21:35 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Darkjeff
7031a5844f Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-07-17 18:41:35 +02:00
Laurent Destailleur
b6c9823ad4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 16:45:47 +02:00
Laurent Destailleur
1ef70b387d Fix bad limit 2017-07-17 16:45:24 +02:00
Laurent Destailleur
b075f7a459 Incomplete translation 2017-07-17 16:32:10 +02:00
Laurent Destailleur
0cf38f7197 Fix log file name not set during install 2017-07-17 16:24:45 +02:00
Laurent Destailleur
b7a6c7d049 Fix log file name not set during install 2017-07-17 16:23:24 +02:00
Maxime Kohlhaas
843172ccc8 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-07-17 11:38:37 +02:00
gauthier
ccbeb162cf FIX : Buying prices must always be in positive valueo 2017-07-17 11:27:57 +02:00
Laurent Destailleur
4fa04247a9 Finished dev 2017-07-17 11:09:32 +02:00
Laurent Destailleur
d832bfc056 Some fix into dol_compress_dir function. 2017-07-17 11:05:38 +02:00
phf
885fc3c5b7 Fix lost search value in list if come from thirdparty card 2017-07-17 11:04:48 +02:00
Laurent Destailleur
330f3af74d Fix pb in recursive dol_dir_list return. 2017-07-17 10:26:36 +02:00