lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,108 Commits 43 Branches 150 Tags 886 MiB
600dbced7e
Commit Graph

46108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b57f0a0e5f Fix option to use old path for product is for compatibility if user come 
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
 2015-06-05 18:32:49 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
 2015-06-05 16:50:46 +02:00
Laurent Destailleur
51d275ee77 Merge pull request #2941 from atm-gauthier/3.7 
FIX : When we clone a propal, if it has a project which is not assign…
 2015-06-05 15:56:36 +02:00
Laurent Destailleur
3c8d54d55f Merge pull request #2938 from FHenry/3.6 
FIX : If supplier invoice block linked element is display after other  block total HT amount is not reset to 0 and sum other block (like customer orders values)
 2015-06-05 15:43:25 +02:00
Laurent Destailleur
a8433aadbe Merge pull request #2962 from hregis/3.7_bug2 
Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany
 2015-06-05 15:42:41 +02:00
Laurent Destailleur
d138e441f8 Merge pull request #2964 from atm-maxime/3.6 
Fix : supplier order clone was buggy if notes contains apostrophe
 2015-06-05 15:42:16 +02:00
Maxime Kohlhaas
f7493de50c Fix : supplier order clone was buggy if notes contains apostrophe 2015-06-05 13:42:29 +02:00
Regis Houssin
e78dba809b Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany 
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
 2015-06-05 09:42:21 +02:00
Florian HENRY
d0a1d2c3a5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-05 09:38:10 +02:00
Laurent Destailleur
15060d973c Merge pull request #2958 from jfefe/patch-8 
FIX #2957 : missing $langs object for trigger
 2015-06-05 09:18:25 +02:00
jfefe
195a1b2708 FIX #2957 : missing $langs object for trigger 2015-06-04 18:10:29 +02:00
Regis Houssin
5139954365 Fix: add filter in "dol_most_recent_files" for avoid conflict with 
option "Save file on server with name "FA0700034_Original filename""
 2015-06-04 16:39:39 +02:00
Regis Houssin
6a3310daf7 Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany 
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
 2015-06-04 15:42:51 +02:00
Laurent Destailleur
f437bd2d6d FIX No check warehouse is provided if module stock is not enabled. 2015-06-03 21:21:20 +02:00
Gauthier
3f4ded4780 FIX : When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third. 2015-06-02 16:06:03 +02:00
Florian HENRY
fb29fa486a FIX : total amount in tpl linked object are not reset 2015-06-02 11:20:08 +02:00
Florian HENRY
bdaf83a653 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-02 08:42:13 +02:00
Florian HENRY
3f1613197e FIX : If supplier invoice block linked element is display after other 
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
 2015-06-02 08:41:42 +02:00
Laurent Destailleur
6e72d3c8cc FIX Export of tags for contact and member 2015-06-01 21:34:21 +02:00
Laurent Destailleur
4f75ab79db Prepare 3.7.2 2015-06-01 16:32:33 +02:00
Laurent Destailleur
f0257d02b5 Minor fix 2015-06-01 16:31:25 +02:00
Laurent Destailleur
d01a777b3e Merge pull request #2761 from tiaris/3_7_picturepath_script 
FIX add a script for migrating pictures of products
 2015-06-01 16:17:13 +02:00
Laurent Destailleur
9ed5d817c4 Merge pull request #2936 from atm-gauthier/3.7 
FIX : When we automatically create an order from a proposal with workf…
 2015-06-01 16:15:37 +02:00
Laurent Destailleur
cc7f2518b6 Merge pull request #2937 from atm-ph/fix_target_list_emailing 
FIX : when mailing is deleted, the targets list was kept in database
 2015-06-01 16:13:24 +02:00
phf
0523f226cf FIX : when mailing is deleted, the targets list was kept in database 2015-06-01 12:29:10 +02:00
Gauthier
cf4308aa3b FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table. 2015-06-01 11:24:30 +02:00
Laurent Destailleur
9753097731 Prepare 3.7.1 2015-05-31 18:45:01 +02:00
Laurent Destailleur
227f2842c2 Prepare version 3.7.1 2015-05-31 18:03:24 +02:00
Laurent Destailleur
19694710b2 Keep this constant visible 2015-05-31 12:24:23 +02:00
Laurent Destailleur
36de50f60d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-31 03:07:36 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
7c4c096310 Fix typo 2015-05-31 02:33:03 +02:00
Laurent Destailleur
3690274375 Merge pull request #2930 from atm-ph/fix_issue_2901 
Fix issue 2901
 2015-05-31 02:09:40 +02:00
Laurent Destailleur
d9e8b6d977 Merge pull request #2921 from atm-gauthier/3.7 
FIX : when we create an agenda event with "Not applicable" status, it…
 2015-05-30 15:10:53 +02:00
Laurent Destailleur
a60ab7dd29 Merge pull request #2912 from atm-ph/fix_36_reassort_target 
FIX top links menu have target attribute with wrong value
 2015-05-30 15:06:46 +02:00
Laurent Destailleur
2fb44caedb Merge pull request #2906 from atm-ph/fix_37_fetch_contact 
FIX : Compare array_options with oldcopy
 2015-05-29 17:41:38 +02:00
phf
9f52b9e800 FIX : #2901 2015-05-29 17:27:05 +02:00
Laurent Destailleur
abcd7ae667 Merge pull request #2903 from atm-ph/fix_37_thirdparty_extrafield 
FIX : extrafields required on thirdparty
 2015-05-29 17:19:20 +02:00
Laurent Destailleur
4324ed82b3 Merge pull request #2878 from atm-alexis/fix_multientity_num_check 
FIX when multicompany was enabled, isExistingObject check wrong
 2015-05-29 17:16:32 +02:00
phf
81b6655940 Merge branch '3.7' of https://github.com/Dolibarr/dolibarr into 3.7 2015-05-29 17:13:03 +02:00
Laurent Destailleur
ab29c594e8 Merge pull request #2920 from hregis/3.7 
Fix: check the user status during authentication
 2015-05-29 16:23:30 +02:00
Alexis Algoud
148c36c9d3 Merge branch 'fix_multientity_num_check' of github.com:atm-alexis/dolibarr into fix_multientity_num_check 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2015-05-29 15:12:31 +02:00
Alexis Algoud
dd7febe2b9 replace test by getEntity() 2015-05-29 15:10:59 +02:00
Alexis Algoud
ab0f805044 Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into fix_multientity_num_check 2015-05-29 15:09:04 +02:00
Gauthier
a707d40251 FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status 2015-05-29 14:32:50 +02:00
Regis Houssin
131c3fcef8 Fix: check the user status during authentication 2015-05-29 10:07:48 +02:00
phf
a676d3a0d1 Merge branch '3.6' into 3.7 2015-05-27 10:56:16 +02:00
phf
5a006d824e FIX : top links menu have target attribute with wrong value 2015-05-27 10:52:23 +02:00
phf
087b026f54 Add fetch extrafields in contact's fetch function 2015-05-26 12:40:49 +02:00
atm-ph
74c4db0f57 Remove comment 
This comment is false, my $_SESSION was wrong
 2015-05-26 11:23:25 +02:00