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

56633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dea2ab06f5 Fix missing translation 2016-11-23 12:31:35 +01:00
Laurent Destailleur
c1628be9c0 Code comment to add some explanations 2016-11-23 12:29:42 +01:00
Laurent Destailleur
52fac193ad MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE does not works as it needs the add 
contact manually. Quick hack added to use the creator instead.
 2016-11-23 11:50:01 +01:00
Laurent Destailleur
da92be1a9f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/fourn/facture/card.php
 2016-11-22 20:55:57 +01:00
Laurent Destailleur
cbd85f7b82 FIX #5958 no discount on supplier command made by replenishment 2016-11-22 20:50:13 +01:00
Laurent Destailleur
cad4acffd2 FIX #6029 2016-11-22 20:40:45 +01:00
Laurent Destailleur
15468d88a0 FIX #6007 2016-11-22 20:36:01 +01:00
Laurent Destailleur
94607d3dea FIX #6007 2016-11-22 20:35:51 +01:00
Laurent Destailleur
5ebb86c45a FIX #6022 2016-11-22 20:24:42 +01:00
Laurent Destailleur
97034a7dff FIX #6009 2016-11-22 20:17:20 +01:00
Laurent Destailleur
b10567f3b4 Fix bad css 2016-11-22 19:55:51 +01:00
Laurent Destailleur
f4fb07b570 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-22 19:45:38 +01:00
Laurent Destailleur
839f30bea9 Fix scrutinizer warnings 2016-11-22 19:45:28 +01:00
Laurent Destailleur
f9f1f92d86 FIX #6025 2016-11-22 19:45:06 +01:00
Laurent Destailleur
12350f180a Merge pull request #5993 from fappels/develop-product-delete-batch 
Fix Delete from product_batch on product delete
 2016-11-22 19:33:07 +01:00
Laurent Destailleur
1a5024d53c Merge pull request #6020 from bgenere/develop 
Fixed issue in list skeleton with extrafields join for search. Main table alias is t not u.
 2016-11-22 19:24:23 +01:00
Laurent Destailleur
117d1253fd Merge pull request #6018 from aspangaro/5.0-p36 
Fix missing language key
 2016-11-22 19:21:52 +01:00
Laurent Destailleur
5652500a60 Merge pull request #6017 from GPCsolutions/develop-5325 
FIX #5325 contract service triggers
 2016-11-22 19:20:17 +01:00
Laurent Destailleur
69d636d51b Merge pull request #6026 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-11-22 19:16:48 +01:00
Scrutinizer Auto-Fixer
2a62564768 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-11-22 18:16:17 +00:00
Laurent Destailleur
cf0a9e8eb1 Push also intermediate debian files on debian package dir 2016-11-22 16:34:59 +01:00
aspangaro
638563dc5d Fix missing language key in holiday type dictionary 2016-11-22 05:54:44 +01:00
aspangaro
6e66d529f0 Fix missing language key for lead status dictionary 2016-11-22 05:33:33 +01:00
aspangaro
38a31cbd28 Fix missing key language in dictionary email models 2016-11-22 05:25:08 +01:00
aspangaro
213e7d1cd7 Fix Missing language key for dictionary format card 2016-11-21 21:49:08 +01:00
bgenere
febb4d7b60 Fixed issue with extrafields join for search. Main table alias is t not 
u.
 2016-11-21 10:15:35 +01:00
aspangaro
31dd20ec7c Spaces 2016-11-20 22:59:13 +01:00
aspangaro
356b76d588 Fix missing language key 2016-11-20 22:35:26 +01:00
fappels
c09d09b869 Remove hasbatch test 
Intention is to remove all data linked to product_stock, which will be
deleted.
 2016-11-20 22:30:40 +01:00
Laurent Destailleur
1c17335d34 FIX Move translation key in correct file 2016-11-20 18:19:39 +01:00
Laurent Destailleur
b035b1e196 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:48:24 +01:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
cb99113ab0 Css 2016-11-20 15:47:14 +01:00
Laurent Destailleur
ff4fa9977c FIX #5895 2016-11-20 15:47:05 +01:00
Laurent Destailleur
fa3a8deade Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-20 15:39:05 +01:00
Laurent Destailleur
e3c529d483 FIX javascript error when using on mobile/smartphone 2016-11-20 15:38:48 +01:00
Raphaël Doursenaud
2f424d2edb
FIX #5325 contract service triggers 
Pass ContratLigne objects to the triggers when updating contract
lines
 2016-11-20 13:21:43 +01:00
Laurent Destailleur
e6894eda0e Better responsive 2016-11-20 10:58:28 +01:00
Laurent Destailleur
34b42d5913 Merge pull request #6008 from defrance/patch-44 
if supplier have multiple price return it several times
 2016-11-19 21:08:59 +01:00
Laurent Destailleur
e6a027911d Merge pull request #5997 from fappels/develop-fix-modify-warehouse 
Fix #5994 unable to update warehouse
 2016-11-19 20:58:54 +01:00
Laurent Destailleur
ef18964d3c Merge pull request #6004 from atm-gauthier/FIX_wrong_var_name 
FIX : wrong var name
 2016-11-19 20:58:21 +01:00
Laurent Destailleur
a17345da12 Fix list of fields must be same in loop and title line. Title must come 
from declaration array.
 2016-11-19 20:07:35 +01:00
Laurent Destailleur
b538f13efb FIX Module gravatar was not triggered on thirdparty and contact card 2016-11-19 19:43:55 +01:00
Laurent Destailleur
77337fe0cc Fix scrutinizer warning 2016-11-19 16:23:50 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Laurent Destailleur
7ac96da0d4 Several fix in warehouse stock change (rounding, api rest) 2016-11-18 16:34:03 +01:00
Laurent Destailleur
0b3765dd9a Fix phpcs 2016-11-18 13:17:24 +01:00
Laurent Destailleur
9b66f8c320 Complete REST services 2016-11-18 13:12:44 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00