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

47428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a94121a8c5 Add field to define picto to use for status 2015-05-12 09:42:14 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +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
c59e365950 Merge pull request #2812 from bafbes/patch-1 
Update html.formfile.class.php
 2015-05-11 23:08:40 +02:00
Laurent Destailleur
acd7e7502b Merge pull request #2808 from aspangaro/develop-md 
Theme Md: Change font & divide by two the border-radius
 2015-05-11 23:04:11 +02:00
Laurent Destailleur
b2fa603f46 Merge pull request #2794 from hregis/develop_origin 
Fix: add $object for use with triggers
 2015-05-11 23:02:41 +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
Juanjo Menent
200b3b167e Merge pull request #2811 from bafbes/patch-2 
Update list.php and core/class/html.formfile.class.php
 2015-05-11 20:16:17 +02:00
Juanjo Menent
23bd8f50df Merge pull request #2809 from atm-maxime/develop 
New : Signature area on proposal PDF
 2015-05-11 20:09:54 +02:00
Juanjo Menent
97b9e87773 Merge pull request #2806 from marcosgdf/revert-25812f0 
Revert 25812f0
 2015-05-11 20:08:15 +02:00
Bahfir Abbes
280c6a04af Update list.php 
Correct erroneous links to supplier invoice documents in list
 2015-05-11 18:03:26 +01:00
Bahfir Abbes
3e4fcd1ac7 Update html.formfile.class.php 
in order to correct document lists in list of supplier invoices
 2015-05-11 17:51:54 +01: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
Laurent Destailleur
a503d90982 FIX We did a test on a permission to export contract when permission did 
not exists.
 2015-05-10 23:37:04 +02:00
Laurent Destailleur
5bac040a9a Enhance prototype for select 2015-05-10 21:21:29 +02:00
Maxime Kohlhaas
443badfbcf New : Signature area on proposal PDF 2015-05-10 17:39:57 +02:00
aspangaro
fece843091 Theme Md: Change font & divide by two the border-radius 2015-05-10 15:08:53 +02:00
Marcos García de La Fuente
fb01f89e95 Unwanted deletion 2015-05-10 12:44:36 +02:00
Marcos García de La Fuente
9988b1ad4e Revert 25812f0 2015-05-10 12:43:21 +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
39b932d37e Merge pull request #2804 from simnandez/develop 
Code fixes
 2015-05-09 14:47:15 +02:00
Juanjo Menent
97ad7ca88b Code fixes 2015-05-09 14:23:26 +02:00
Juanjo Menent
ce1769d2c5 Merge pull request #2803 from simnandez/develop 
Code fixes
 2015-05-09 13:59:11 +02:00
Juanjo Menent
e07cebd50b Merge pull request #2793 from GPCsolutions/htmlfixes 
HTML fixes
 2015-05-09 13:58:43 +02:00
Juanjo Menent
27035b42b0 Merge pull request #2788 from GPCsolutions/testaccess 
Change low level access verification to a better high level one
 2015-05-09 13:55:17 +02:00
Juanjo Menent
d4e8e58e54 Code fixes 2015-05-09 13:25:40 +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
Juanjo Menent
c5101ae5ea Code fixes 2015-05-07 20:07:47 +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
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
c219d4a336 [Qual] Fix form label id reference 2015-05-07 14:21:13 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +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
85244ba8c9 Fix: add $object for use with triggers 2015-05-07 12:06:17 +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