Commit Graph

38596 Commits

Author SHA1 Message Date
simnandez
614f376392 Trad: Fix bad descriptor 2013-09-03 09:25:14 +02:00
Laurent Destailleur
b02bf5a2a7 Syn with transifex 2013-09-03 00:42:54 +02:00
Laurent Destailleur
7f762fdbf8 Fix: doc 2013-09-03 00:06:42 +02:00
Juanjo Menent
75f63c15dd Merge pull request #1206 from grandoc/develop
uniformize
2013-09-02 09:45:08 -07:00
Grand Philippe
da384dda18 uniformize 2013-09-02 11:53:07 +02:00
Juanjo Menent
58c501fe51 Merge pull request #1205 from grandoc/develop
Fix: Contracts activate a model
2013-09-02 01:35:24 -07:00
Grand Philippe
4c5d9e8441 fix : activate a model 2013-09-02 10:17:45 +02:00
Grand Philippe
4fe1843800 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-09-02 10:15:31 +02:00
Grand Philippe
f46cfd8235 git ask me for that 2013-09-02 10:14:41 +02:00
simnandez
58e2c4e38e Fix: compatiblity with multicompany module 2013-09-02 10:08:38 +02:00
Laurent Destailleur
cb52af4f47 Qual: Make code more generic 2013-09-02 02:14:16 +02:00
Laurent Destailleur
b150e03b06 Fix: bad merge.
Fix: Restore backward compatibility. Add option hideifdisabled for call
that does not need disabled users.
2013-09-02 00:47:30 +02:00
Laurent Destailleur
3a4896609a Fix: Remove debug print 2013-09-02 00:38:13 +02:00
Laurent Destailleur
e6611b6ba1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-02 00:34:55 +02:00
Laurent Destailleur
51cc957b97 Fix: select list on external table 2013-09-02 00:34:41 +02:00
Laurent Destailleur
20b92ca4d7 Merge pull request #1160 from defrance69/patch-10
Update index.php
2013-09-01 15:20:57 -07:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Laurent Destailleur
1392f4e623 Merge pull request #1203 from PaulPoulain/966-develop
T966-develop : Put the poste of the contact in the list
2013-09-01 14:49:06 -07:00
Laurent Destailleur
8cd1563f58 More test 2013-09-01 20:55:59 +02:00
Laurent Destailleur
0ca6c3f6ad Fix: Missing class 2013-08-31 16:58:25 +02:00
Laurent Destailleur
4272209832 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-31 12:44:13 +02:00
Laurent Destailleur
dad2200a45 More screenshot 2013-08-31 12:43:52 +02:00
Laurent Destailleur
a8096c7359 New: Export/import profile include state. 2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select
thirdparty list
2013-08-30 18:18:58 +02:00
Florian Henry
8b9b682eaf Merge remote-tracking branch 'origin/develop' into develop 2013-08-30 18:11:47 +02:00
Florian Henry
853758a422 REplicate extrafield value
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e All deposit inoice form order 2013-08-30 10:46:05 +02:00
simnandez
2a8aa50163 Fix: Intervention box links to contracts id
Conflicts:
	htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
lalaina rasamoelina
fcd6985196 T966-develop : Put the poste of the contact in the list
In the list of contact when we send a mail,i added the post of person in () after the name
htdocs/commande/fiche.php?id=481&action=presend&mode=init
2013-08-29 10:32:28 +02:00
simnandez
a321264a2a Fix: Localtaxes balance not showing
Conflicts:
	ChangeLog
2013-08-29 10:03:32 +02:00
lalaina rasamoelina
3156f8cae0 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-29 09:30:26 +02:00
Florian Henry
42f165af15 Export module : Allow user define "field as field name" 2013-08-28 23:08:12 +02:00
Florian Henry
29396bd51a Change SQL syntax 2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb adjust spacing 2013-08-28 16:50:38 +02:00
Florian Henry
650689d294 Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103 2013-08-28 16:49:22 +02:00
Laurent Destailleur
710c9517f4 Cleaner example 2013-08-28 16:39:23 +02:00
Regis Houssin
841961df4e Fix: wrong function name 2013-08-27 14:53:24 +02:00
Laurent Destailleur
7f549e60f2 Fix: Bad selection of years into graphics 2013-08-27 12:02:33 +02:00
Laurent Destailleur
657c4d6e90 Fix: Fix graph for product distribution.
Add limit and add entry other.
2013-08-27 11:54:07 +02:00
simnandez
34fe1fba7f Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:45:24 +02:00
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/product/class/product.class.php
2013-08-27 09:36:54 +02:00
Laurent Destailleur
9cf2d8c556 Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter
Update parameter as expected by the function name
2013-08-26 14:12:30 -07:00
Laurent Destailleur
570fee7e07 Merge pull request #1198 from FHenry/3.4
Fix: If only service module is activated, it's impossible to delete
2013-08-26 14:10:36 -07:00
Laurent Destailleur
83c3bde1bd Merge pull request #1197 from grandoc/develop
some fix for contract model and clean code
2013-08-26 14:10:08 -07:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Grand Philippe
ed31c83fbb some fix for contract model 2013-08-26 15:42:01 +02:00
Grand Philippe
24e6042378 some fix for contract model 2013-08-26 15:32:56 +02:00
Grand Philippe
2591fa95f0 some trad for contract model 2013-08-26 15:07:36 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete
service
2013-08-26 14:39:35 +02:00
Grand Philippe
7a64ad1a26 some fix for contract model and clean code 2013-08-26 14:29:46 +02:00