Florian Henry
|
d8ddb8b3e7
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-03 20:07:13 +02:00 |
|
Florian Henry
|
b4d858828f
|
Add ref supplier into muscadet model
|
2013-09-03 20:07:08 +02:00 |
|
Florian Henry
|
cb86cd403c
|
Fix: Delete linked element to supplier invoice when deleted (as done for
all other object into dolibarr)
|
2013-09-03 20:01:10 +02:00 |
|
Laurent Destailleur
|
64b44298ae
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-03 18:19:15 +02:00 |
|
Laurent Destailleur
|
c5020056b3
|
Revert commit.
Bug into update function. Also what was difference of new field ?
|
2013-09-03 18:18:22 +02:00 |
|
simnandez
|
6ae3603549
|
Trad: Add missing translations
|
2013-09-03 18:16:30 +02:00 |
|
Laurent Destailleur
|
23df3d82e5
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-09-03 18:10:55 +02:00 |
|
Laurent Destailleur
|
3bfaadc054
|
Work on feature to change rule for vat calculation rounding
|
2013-09-03 18:08:50 +02:00 |
|
Grand Philippe
|
222eb18bb9
|
fix :
Fatal error: Call to undefined function dol_time_plus_duree()
|
2013-09-03 17:37:22 +02:00 |
|
Juanjo Menent
|
bcbe4e582c
|
Merge pull request #1209 from grandoc/develop
Add an additional description for the category products
|
2013-09-03 06:25:39 -07:00 |
|
Grand Philippe
|
9f01aa51a3
|
fix regression
|
2013-09-03 15:19:03 +02:00 |
|
Grand Philippe
|
397d0e3b81
|
Add an additional description for the category products
|
2013-09-03 15:12:15 +02:00 |
|
Juanjo Menent
|
7293d58002
|
Merge pull request #1208 from grandoc/develop
Add an additional description for the category products
|
2013-09-03 02:43:30 -07:00 |
|
Grand Philippe
|
6d6f30725b
|
Add an additional description for the category products
|
2013-09-03 11:41:33 +02:00 |
|
Laurent Destailleur
|
e40452f3b2
|
Fix: Bug if modules not enabled
|
2013-09-03 11:36:28 +02:00 |
|
Grand Philippe
|
dfdc9da781
|
Add an additional description for the category products
|
2013-09-03 11:15:19 +02:00 |
|
BENKE Charles
|
bb8f8332f9
|
Update modProjet.class.php
enhance export feature with
left join and projet_task_time data
|
2013-09-03 11:12:29 +02:00 |
|
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 |
|
Grand Philippe
|
da384dda18
|
uniformize
|
2013-09-02 11:53:07 +02:00 |
|
Grand Philippe
|
4c5d9e8441
|
fix : activate a model
|
2013-09-02 10:17:45 +02:00 |
|
simnandez
|
58e2c4e38e
|
Fix: compatiblity with multicompany module
|
2013-09-02 10:08:38 +02:00 |
|
simnandez
|
83042459a5
|
Fix: compatiblity with multicompany module
|
2013-09-02 10:07:44 +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
|
b95aa1ac7b
|
Fix: select list on external table
Conflicts:
htdocs/core/class/extrafields.class.php
|
2013-09-02 00:41:14 +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
|
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 |
|
simnandez
|
b86e20f0e6
|
Fix: Intervention box links to contracts id
|
2013-08-29 12:05:29 +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 |
|
simnandez
|
fa4a9c73c4
|
Fix: Localtaxes balance not showing
|
2013-08-29 09:58:07 +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 |
|