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

45554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0bf7dd0686 Merge pull request #2824 from atm-maxime/3.7 
Fix : bad link when sorting shipment list #2823
 2015-05-12 22:42:17 +02:00
Maxime Kohlhaas
942564be56 Fix : bad link when sorting shipment list #2823 2015-05-12 22:36:34 +02:00
Laurent Destailleur
8075a92d5b FIX Bad logo for status "Do not contact" of thirdparty. 2015-05-12 02:40:21 +02:00
Laurent Destailleur
ac99f3aa8f Update changelog 2015-05-12 02:34:59 +02:00
Laurent Destailleur
92a25e3d4c Prepare 3.7.1 2015-05-12 00:11:51 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
 2015-05-11 23:53:38 +02:00
Laurent Destailleur
2a486f471b Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/class/product.class.php
 2015-05-11 23:39:45 +02:00
Laurent Destailleur
ad993f246d Merge pull request #2795 from hregis/3.7 
Fix: add $object for use with triggers
 2015-05-11 23:36:43 +02:00
Laurent Destailleur
5f594d55ac Merge pull request #2805 from marcosgdf/bug-2758 
FIX #2758 Product::update sets product note to "null" when $prod->note is null
 2015-05-11 23:00:25 +02:00
Laurent Destailleur
f275145bd2 FIX We did a test on a permission to export contract when permission did 
not exists.
 2015-05-10 23:46:34 +02:00
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
Marcos García de La Fuente
f6616deef3 Removed debugging function 2015-05-10 01:28:40 +02:00
Marcos García de La Fuente
f8e8b39ff2 FIX #2758 Product::update sets product note to "null" when $prod->note is null 2015-05-10 01:27:28 +02:00
Juanjo Menent
577c872aaf Code fixes 2015-05-07 20:44:31 +02:00
Juanjo Menent
b7228e191c Merge pull request #2801 from FHenry/3.6 
FIX : [ bug #1926 ] [contract] Wrong Rights Checked
 2015-05-07 20:21:05 +02:00
Florian HENRY
5395465cfd Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-05-07 17:24:51 +02:00
Florian HENRY
29f562460a fix [ bug #1926 ] [contract] Wrong Rights Checked 2015-05-07 17:23:32 +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
Regis Houssin
5578151bad Fix: add $object for use with triggers 2015-05-07 12:08:02 +02:00
Regis Houssin
9ed658ab8f Merge remote-tracking branch 'dolibarr/3.7' into 3.7 2015-05-07 11:44:36 +02:00
Regis Houssin
c6d841613b Revert "Fix: use global $object instead parameter" 
This reverts commit 4f8c485914.
 2015-05-07 11:42:35 +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
5d65d666f7 Merge pull request #2778 from atm-maxime/3.6 
Fix : shipment PDF was not using generation params
 2015-05-06 21:00:49 +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
Regis Houssin
4f8c485914 Fix: use global $object instead parameter 2015-05-06 16:46:12 +02:00
Maxime Kohlhaas
42455f771a Missing comments 2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
d2603d5308 Fix : shipment was not considered as billed after classifybilled function 2015-05-06 12:39:10 +02:00
Maxime Kohlhaas
b203263e91 Fix : shipment PDF was not using generation params 2015-05-06 12:16:36 +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
a6b0f6cfac Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:56:39 +02:00
Juanjo Menent
6309d2133f Merge pull request #2731 from GPCsolutions/dolibarr-2729 
Allow exporting projects without a third party
 2015-05-01 15:55:40 +02:00
Juanjo Menent
0808de9a1e Merge pull request #2738 from GPCsolutions/dolibarr-2712 
Fixed SQL table reference for members types in export
 2015-04-30 20:33:35 +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
Raphaël Doursenaud
f1032baaab Allow exporting projects without a third party 
FIX #2729
 2015-04-30 11:48:32 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Destailleur
43efd76b24 Fix remove warnings 2015-04-29 23:39:34 +02:00
Laurent Destailleur
7419319c0f Protection into packager 2015-04-29 22:39:42 +02:00