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

45498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1a70e9c5f9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-28 21:12:38 +02:00
Laurent Destailleur
b30ee6b3fa Better fix for #2725 2015-04-28 21:12:04 +02:00
Juanjo Menent
6cfd8d64f5 Change bugtracker to github in all maintened versions 2015-04-27 20:34:52 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1
 2015-04-27 20:22:03 +02:00
Juanjo Menent
8124cd2088 Merge pull request #2716 from fmarcet/3.7 
Fix: Bug in the new photo system
 2015-04-27 17:10:37 +02:00
fmarcet
99c4508029 Fix: Bug in the new photo system 2015-04-27 16:44:12 +02:00
Laurent Destailleur
50a6c133c9 Fix error management 2015-04-27 11:46:30 +02:00
Laurent Destailleur
92f2c48475 Fixed #2714 2015-04-27 11:46:08 +02:00
Laurent Destailleur
ce05837237 Translation 2015-04-27 09:55:59 +02:00
Laurent Destailleur
2e05a4f1be Fix #2713 2015-04-27 03:21:55 +02:00
Laurent Destailleur
aa9bffe5c9 Fix translation 2015-04-27 02:34:15 +02:00
Laurent Destailleur
a0c27620b2 Fix to match spanish new vat value 2015-04-26 18:28:08 +02:00
Laurent Destailleur
2f070b0e1b Fix data to match spanish current setup 2015-04-26 17:56:41 +02:00
Laurent Destailleur
1abcd5f4fe Fix test for vat calculation 2015-04-26 16:58:00 +02:00
Laurent Destailleur
7b9d9c4d0a Fix lang 2015-04-26 16:25:02 +02:00
Laurent Destailleur
13b4d86064 Better fix for #2709 2015-04-24 21:29:02 +02:00
Laurent Destailleur
d925e552ca Merge pull request #2709 from atm-alexis/3.7 
FIX event not linked to contact on creation
 2015-04-24 21:23:50 +02:00
Laurent Destailleur
de74bbed3a Merge pull request #2702 from atm-gauthier/3.7 
FIX : display linked object in edit mode when we create an event from an...
 2015-04-24 21:10:02 +02:00
Laurent Destailleur
788ec8cd88 Merge pull request #2698 from fappels/3.7 
FIX: can show print page after product save
 2015-04-24 21:08:20 +02:00
Alexis Algoud
7d3482036d FIX event not linked to contact on creation 2015-04-24 17:40:53 +02:00
Laurent Destailleur
d47b9a759a FIX migration error 2015-04-24 00:33:02 +02:00
Gauthier
58008cef94 NEW : display linked object in edit mode when we create an event from an order, propal... 2015-04-23 16:28:29 +02:00
Laurent Destailleur
1fcf10fd8a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-23 13:55:08 +02:00
Laurent Destailleur
c97c5e0cfd Fix selection of user was lost 2015-04-23 13:54:49 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +02:00
Francis Appels
93d9321088 FIX: can show print page after product save 
Add product id to form action to be able show print page from product
card after save.
 2015-04-22 23:27:09 +02:00
Laurent Destailleur
47ecb91a3e Avoid DOS attack when high number of tasks 2015-04-22 21:17:49 +02:00
Laurent Destailleur
7f5377d219 Fix #2695 2015-04-22 19:25:20 +02:00
Laurent Destailleur
12d841f27d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-22 14:58:39 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
8555691c04 Merge pull request #2680 from marcosgdf/bug-1897-hook 
[ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on
 2015-04-21 11:12:29 +02:00
Marcos García de La Fuente
ad5dd8e70f [ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on 2015-04-20 01:36:48 +02:00
Laurent Destailleur
349ce5c18f Merge pull request #2672 from atm-maxime/3.7 
Fix : prevelement with SEPA
 2015-04-19 01:59:54 +02:00
Maxime Kohlhaas
54a68116e4 Fix : prevelement with SEPA 2015-04-19 01:55:35 +02:00
Laurent Destailleur
b7ffdba55f Merge remote-tracking branch 'origin/3.6' into 3.7 2015-04-19 01:00:48 +02:00
Laurent Destailleur
fdd34c582c Merge pull request #2665 from atm-maxime/3.6 
Fix : include facture class for outstanding bill
 2015-04-19 00:59:21 +02:00
Maxime Kohlhaas
5a66e1f98a Fix : include facture class for outstanding bill 2015-04-19 00:26:05 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/expedition/fiche.php
 2015-04-18 23:55:17 +02:00
Laurent Destailleur
b8c512a3d5 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2015-04-18 23:34:42 +02:00
Laurent Destailleur
be9ddb7748 Merge pull request #2595 from marcosgdf/bug-2576 
Close #2576 Bug: Unable to edit a dictionary entry that has # in its ref
 2015-04-18 22:24:21 +02:00
Marcos García de La Fuente
37d8dafd40 Merge branch '3.5' into bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 21:44:24 +02:00
Laurent Destailleur
4de4c66bb7 git push origin 3.5Merge branch 'marcosgdf-bug-2576' into 3.5 2015-04-18 20:56:40 +02:00
Laurent Destailleur
ed6abb0f79 Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 
Conflicts:
	ChangeLog
 2015-04-18 20:56:27 +02:00
Laurent Destailleur
e49a46a386 Merge pull request #2653 from atm-maxime/3.6 
Fix : menu financial was not displayed when only supplier module is acti...
 2015-04-18 20:30:24 +02:00
Laurent Destailleur
5f49b2a9bb git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5 2015-04-18 20:12:49 +02:00
Laurent Destailleur
b7cf0ded00 Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 
Conflicts:
	ChangeLog
 2015-04-18 20:12:27 +02:00
Maxime Kohlhaas
7b035d3b5f Fix : menu financial was not displayed when only supplier module is activated 2015-04-18 20:11:19 +02:00
Laurent Destailleur
b75722d450 git push origin 3.5Merge branch 'marcosgdf-bug-2583' into 3.5 2015-04-18 20:10:41 +02:00
Laurent Destailleur
9b69b64626 Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 
Conflicts:
	ChangeLog
 2015-04-18 20:10:06 +02:00