phf
|
01b881a0a6
|
Fix builddoc with odt lost value of extrafields as "sellist" on view card
|
2016-06-04 13:24:42 +02:00 |
|
Juanjo Menent
|
baa6dd84cf
|
Fix better perfomance in for
|
2016-06-04 13:12:05 +02:00 |
|
jean
|
6873e7afec
|
Revert "#5224 Adding "Copyof" before invoice label to remind user to change it and avoid label to be the label of cloned invoice "
This reverts commit b3504977b0.
|
2016-06-04 12:10:38 +02:00 |
|
Maxime Kohlhaas
|
cc2b2a0baa
|
Don't delete link between order and shipment
|
2016-06-04 11:52:36 +02:00 |
|
jean
|
0d115e0ed0
|
Merge remote-tracking branch 'origin/develop' into devcamp2
|
2016-06-04 11:41:49 +02:00 |
|
jean
|
0f14f5a86f
|
supp
|
2016-06-04 11:39:05 +02:00 |
|
Laurent Destailleur
|
bfb7923d4c
|
Merge pull request #5268 from atm-ph/fix_multicurrency_conf
Fix conf useful has been commented
|
2016-06-04 11:37:01 +02:00 |
|
Laurent Destailleur
|
5a105b75ec
|
Merge pull request #5276 from atm-maxime/fix_import_mapping
FIX #5229
|
2016-06-04 11:35:27 +02:00 |
|
jean
|
b3504977b0
|
#5224 Adding "Copyof" before invoice label to remind user to change it
and avoid label to be the label of cloned invoice
|
2016-06-04 11:34:37 +02:00 |
|
jean
|
3102981b88
|
maj source
|
2016-06-04 11:04:04 +02:00 |
|
Juanjo Menent
|
8a9dd14ab7
|
Merge pull request #5278 from novalore/develop
other fixes in en_US lang files
|
2016-06-04 10:08:02 +02:00 |
|
Juanjo Menent
|
43d475aa42
|
Merge pull request #5272 from simnandez/3.9
Fix issues with strict mode
|
2016-06-04 10:07:01 +02:00 |
|
Laurent Destailleur
|
eb7a4c5ccf
|
FIX Creating a supplier order from proposal order
|
2016-06-04 02:39:13 +02:00 |
|
cla
|
e1c27216ce
|
FIX #4825
|
2016-06-04 02:20:11 +02:00 |
|
novalore
|
3ee8f931b4
|
other fixes in en_US lang files
|
2016-06-04 02:16:58 +02:00 |
|
Laurent Destailleur
|
c9834117c9
|
Fix #5156
|
2016-06-04 02:03:30 +02:00 |
|
Laurent Destailleur
|
32b6766a7d
|
FIX #5195
|
2016-06-04 01:50:01 +02:00 |
|
phf
|
b000ccf2e2
|
Fix traduction for multicurrency module
|
2016-06-04 01:46:10 +02:00 |
|
cla
|
6c126da9a9
|
FIX #4141
|
2016-06-04 01:34:04 +02:00 |
|
Maxime Kohlhaas
|
a1c7632a50
|
Fix import mapping #5229
|
2016-06-04 01:28:51 +02:00 |
|
Laurent Destailleur
|
ff6daebee6
|
FIX #5203
|
2016-06-04 01:19:27 +02:00 |
|
Laurent Destailleur
|
b57476153f
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
|
2016-06-04 01:14:36 +02:00 |
|
phf
|
495ce2463d
|
Fix switch currency on document do not get the associate rate
|
2016-06-04 01:13:23 +02:00 |
|
Laurent Destailleur
|
085fa6902b
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
|
2016-06-04 00:58:16 +02:00 |
|
Laurent Destailleur
|
609cc1dd70
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-06-04 00:53:09 +02:00 |
|
Laurent Destailleur
|
9c3365aefc
|
FIX #5163
|
2016-06-04 00:52:55 +02:00 |
|
phf
|
e3a5af6ad4
|
Fix clean multicurrency admin
|
2016-06-04 00:42:01 +02:00 |
|
Laurent Destailleur
|
b51c4ab57b
|
Merge pull request #5275 from novalore/develop
Miscellaneous typos and errors in en_US lang files
|
2016-06-04 00:20:27 +02:00 |
|
Laurent Destailleur
|
1f65ca1961
|
Merge pull request #5274 from atm-maxime/fix_import_model_type_size4
Fix import model not correctly saved #5185
|
2016-06-04 00:18:32 +02:00 |
|
Laurent Destailleur
|
6cef3b8a96
|
Merge pull request #5273 from atm-maxime/fix_import_model_type_size
Fix import model not correctly saved #5185
|
2016-06-04 00:18:23 +02:00 |
|
novalore
|
e2ba9c72a8
|
French string in main.lang
|
2016-06-04 00:18:15 +02:00 |
|
Laurent Destailleur
|
5c36aa3802
|
Merge pull request #5271 from aschio/develop
FIX #5192
|
2016-06-04 00:17:45 +02:00 |
|
Maxime Kohlhaas
|
f2e4fdcce4
|
Fix import model not correctly saved #5185
|
2016-06-04 00:16:01 +02:00 |
|
novalore
|
1227ee5eb6
|
Miscellaneous typos and errors in en_US lang files
|
2016-06-04 00:14:56 +02:00 |
|
Maxime Kohlhaas
|
8901b99e2d
|
Fix import model not correctly saved #5185
|
2016-06-04 00:14:08 +02:00 |
|
Laurent Destailleur
|
b47db3e9e1
|
Merge pull request #5266 from atm-maxime/fix_project_time_spent_access
Fix access to project task time spent creation #5249
|
2016-06-04 00:13:32 +02:00 |
|
Laurent Destailleur
|
b9feae0883
|
Merge pull request #5270 from atm-maxime/fix_pmp_when_stock_enabled
Fix pmp when stock enabled
|
2016-06-04 00:12:53 +02:00 |
|
cla
|
deb7c407ad
|
FIX #4643
|
2016-06-04 00:08:13 +02:00 |
|
Juanjo Menent
|
66c73015b2
|
Fix issues with strict mode
|
2016-06-03 23:58:54 +02:00 |
|
Juanjo Menent
|
9e85ae3d47
|
Merge remote-tracking branch 'origin/3.9' into 3.9
|
2016-06-03 23:53:14 +02:00 |
|
Maxime Kohlhaas
|
8b0b3b1a9d
|
PMP available only if stock module enabled
|
2016-06-03 23:49:34 +02:00 |
|
cla
|
18424812db
|
closes #5192.
I deleted the line and moved last_insert_id() functions 3 lines under
|
2016-06-03 23:49:08 +02:00 |
|
Laurent Destailleur
|
d20d88e1af
|
Merge pull request #5265 from atm-ph/fix_3.8_soc.php_with_wrong_id
Fix #4632
|
2016-06-03 23:43:54 +02:00 |
|
phf
|
923952fb25
|
Fix conf useful has been commented
|
2016-06-03 23:36:58 +02:00 |
|
Maxime Kohlhaas
|
c9c7045a6f
|
Fix access to project task time spent creation #5249
|
2016-06-03 23:34:37 +02:00 |
|
Laurent Destailleur
|
4226396da4
|
Merge pull request #5262 from atm-ph/fix_develop_fetch_extra_link
Fix using extrafield type "link to object" show error on edit card
|
2016-06-03 23:18:24 +02:00 |
|
phf
|
778b05c341
|
Fix #4632
|
2016-06-03 23:06:53 +02:00 |
|
Laurent Destailleur
|
149c6916f8
|
FIX ##5263
|
2016-06-03 22:20:58 +02:00 |
|
Laurent Destailleur
|
f81a4c56b7
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-06-03 22:15:25 +02:00 |
|
Laurent Destailleur
|
fb724566f0
|
FIX #5252
|
2016-06-03 22:15:07 +02:00 |
|