Commit Graph

39181 Commits

Author SHA1 Message Date
Laurent Destailleur
1714b8bdbe Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-10 23:44:02 +02:00
Laurent Destailleur
8b596d7a69 Fix css missing 2015-05-10 23:43:18 +02:00
Juanjo Menent
577c872aaf Code fixes 2015-05-07 20:44:31 +02:00
Laurent Destailleur
afc487ef9d Fix phpcs 2015-05-07 13:28:03 +02:00
Juanjo Menent
f993920d67 Commenting function 2015-05-07 13:23:00 +02:00
Laurent Destailleur
971e23e006 Fix special_code was lost when updating line 2015-05-07 12:10:27 +02:00
Laurent Destailleur
f197a94f59 Fix duplicate log 2015-05-07 10:52:41 +02:00
Laurent Destailleur
cc5968fbd5 A more complete error message 2015-05-07 10:45:35 +02:00
Laurent Destailleur
36ebaf7a22 Clean code 2015-05-06 23:31:03 +02:00
Juanjo Menent
7adbf033df Merge pull request #2759 from fmarcet/3.7
FIX: Bug on order and supplier invoice numeration mask when use supplier
2015-05-06 21:37:15 +02:00
Maxime Kohlhaas
72c4337f4b Fix : shipment PDF was not using generation params
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Juanjo Menent
ea95a461e2 Fix: Make propal pdf "azur" compatible with the two products images
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +02:00
Laurent Destailleur
467ee7b771 Fix error into export filter step
Conflicts:
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modContrat.class.php
	htdocs/core/modules/modFournisseur.class.php
2015-05-05 12:45:38 +02:00
Laurent Destailleur
2caf137ea0 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-04 22:05:21 +02:00
Laurent Destailleur
9b55bedf66 FIX bad calculation for stock value 2015-05-04 22:04:58 +02:00
fmarcet
077a9c6510 FIX: Bug on order and supplier invoice numeration mask when use supplier
code
2015-05-04 09:22:55 +02:00
Laurent Destailleur
4f9af75afa Merge pull request #2723 from ndrosis/patch-17
hide password
2015-05-03 21:20:31 +02:00
Laurent Destailleur
984aca28c3 Sync translation 2015-05-03 15:37:15 +02:00
Raphaël Doursenaud
93937fe7f3 Allow exporting projects without a third party
FIX #2729
2015-05-01 15:58:36 +02:00
Raphaël Doursenaud
afc582a369 Fixed SQL table reference for members types in export
FIX #2712
2015-04-30 17:20:53 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Destailleur
060d8a1a38 FIX Ref/label of product on contract line was not visible, nor into
page, nor into PDF.
2015-04-29 19:57:01 +02:00
Laurent Destailleur
83daa67cc6 FIX Description of contract line was not visible. 2015-04-29 19:15:14 +02:00
Laurent Destailleur
b0071a7c6c Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/main.inc.php
2015-04-28 21:14:17 +02:00
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
Drosis Nikos
524a535f6d hide password 2015-04-28 16:34:03 +03:00
Juanjo Menent
6cfd8d64f5 Change bugtracker to github in all maintened versions 2015-04-27 20:34:52 +02:00
Juanjo Menent
cfaaf56428 Change bugtracker to github in all maintened versions 2015-04-27 20:34:26 +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
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
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