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

35656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4119fde0e5 Merge pull request #665 from FHenry/develop 
Fix mass mailing tabs regression
 2013-02-18 07:46:07 -08:00
Grand Philippe
108b4d1ae9 fix language 2013-02-18 16:10:27 +01:00
jfefe
a197e6a026 Merge branch 'extra_odt' into extrafields 2013-02-18 15:50:47 +01:00
jfefe
9c1cb5bc2a Merge branch 'extra_odt' into fgd 2013-02-18 15:47:56 +01:00
jfefe
110713f6ca Fix : display correct value in ODT for extrafields 2013-02-18 15:47:40 +01:00
fhenry
195af1f2bd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-18 15:25:27 +01:00
fhenry
fd4a465c90 Fix mass maling tabs regression 2013-02-18 15:25:13 +01:00
Laurent Destailleur
e9dc4b9db3 Fix: We must not add month holidays after init of sold. 2013-02-18 15:15:10 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
 2013-02-18 15:01:00 +01:00
Laurent Destailleur
f13f4c2cb5 Merge pull request #664 from grandoc/develop 
fix language
 2013-02-18 05:26:25 -08:00
Grand Philippe
b484fef22a fix language 2013-02-18 14:19:01 +01:00
Laurent Destailleur
70ea5b0b1d Merge pull request #663 from jfefe/extrafields 
Work on extrafields
 2013-02-18 05:17:06 -08:00
Laurent Destailleur
3cb9e2e97d Merge pull request #662 from grandoc/develop 
fix language
 2013-02-18 05:15:43 -08:00
Laurent Destailleur
b5260e4ab1 Fix: Translation 2013-02-18 14:13:02 +01:00
Grand Philippe
020dff3699 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-18 13:48:11 +01:00
Grand Philippe
0a697e1033 fix language 2013-02-18 13:47:46 +01:00
jfefe
2f4a80215b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-02-18 13:39:00 +01:00
Laurent Destailleur
f82bec552b Fix: Check id field are mandatory 2013-02-18 13:07:32 +01:00
Laurent Destailleur
fb845b3a37 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-18 13:02:13 +01:00
Laurent Destailleur
37e9b04d83 Fix: Check id field are mandatory 2013-02-18 12:57:14 +01:00
Grand Philippe
d2cc6d299c fix language 2013-02-18 12:19:01 +01:00
jfefe
4ff08b026f Merge branch 'extrafields' into fgd 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2013-02-18 00:59:32 +01:00
jfefe
fe57b513f8 Merge branch 'extra_odt' into extrafields 2013-02-18 00:58:54 +01:00
jfefe
71a2b4c8c0 In ODT document add currency symbol with extrafields of type "price" 2013-02-18 00:58:40 +01:00
jfefe
bd2d9cdd3e Split extrafields display into 2 columns (thirdparty) 2013-02-18 00:41:50 +01:00
jfefe
3ef8c6e5dd Missing variable declaration 2013-02-18 00:40:49 +01:00
Laurent Destailleur
fedf4edea9 Merge pull request #661 from FHenry/develop 
Manage tabs (add/remove by external module) for mass emalings screen
 2013-02-17 14:04:07 -08:00
fhenry
3694031053 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-17 21:41:27 +01:00
jfefe
8ebb48cb5c Fix : in ODT show value and not label of company extrafield 2013-02-17 21:28:00 +01:00
jfefe
060060f08b Missing object $langs when showing extrafield of type 'price' 2013-02-17 21:27:48 +01:00
jfefe
16e9f6db48 Fix : bad name of property when retrieve extrafields for thirdparty 2013-02-17 21:27:33 +01:00
jfefe
527beab671 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt 2013-02-17 21:26:56 +01:00
jfefe
8ca9d8e601 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into fgd 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-02-17 21:15:49 +01:00
jfefe
a5279499ef Fix : in ODT show value and not label of company extrafield 2013-02-17 21:14:00 +01:00
jfefe
d5f0eac908 Missing object $langs when showing extrafield of type 'price' 2013-02-17 20:14:18 +01:00
Laurent Destailleur
d6e907b69b Fix: Nb of holidays was not using correct user 2013-02-17 19:26:33 +01:00
Laurent Destailleur
2bad9c0d9a Fix: Nb of holidays was not using correct user 2013-02-17 19:25:55 +01:00
Laurent Destailleur
660fd2e785 Doc 2013-02-17 18:46:46 +01:00
Laurent Destailleur
8af34ee97e Fix: Bad property 2013-02-17 18:40:09 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/filefunc.inc.php
 2013-02-17 17:25:38 +01:00
Laurent Destailleur
b0695d3bbb Preapre 3.3 2013-02-17 17:20:05 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
9a951e4d6d Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:19 +01:00
Laurent Destailleur
b434f58af3 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:06:55 +01:00
Laurent Destailleur
e56e182fe9 Fix: When creating invoice from other object, type must be "standard". 2013-02-17 16:37:28 +01:00
Laurent Destailleur
9f8ffe242a Fix: A text field can not have a default value 2013-02-17 16:26:06 +01:00
Laurent Destailleur
aa8413d7cb Fix: Missing migration 
Fix: Error management
 2013-02-17 16:20:49 +01:00
jfefe
06398d9077 Fix : bad name of property when retrieve extrafields for thirdparty 2013-02-17 14:37:33 +01:00
Laurent Destailleur
aff919fd10 Fix: Bad test 2013-02-17 12:45:46 +01:00