Laurent Destailleur
|
baebc7e91d
|
Fix: Not coherent filename
|
2013-11-24 19:33:22 +01:00 |
|
Laurent Destailleur
|
65b6dca554
|
Fix: business rule to protect button and action was not synchronized
|
2013-11-24 13:46:40 +01:00 |
|
Laurent Destailleur
|
6f5e78d27e
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
|
2013-11-21 18:42:14 +01:00 |
|
Laurent Destailleur
|
29e029161f
|
Fix: Restore translation lost because entry was not set into en_US lang.
|
2013-11-21 18:41:06 +01:00 |
|
Laurent Destailleur
|
0d853cf73d
|
Fix: [ bug #1118 ] Minor problem on print page link
|
2013-11-21 02:49:22 +01:00 |
|
Laurent Destailleur
|
e63dcc5343
|
Fix: [ bug #1119 ] If no country is selected for a warehouse or thids
card,
broken IMG is shown
|
2013-11-21 02:14:25 +01:00 |
|
Laurent Destailleur
|
23f7de0873
|
Fix: [ bug #1094 ] Invoice Text Reminder
Conflicts:
htdocs/compta/facture.php
|
2013-11-21 02:07:13 +01:00 |
|
Laurent Destailleur
|
35596acf40
|
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/product/fiche.php
|
2013-11-20 23:46:33 +01:00 |
|
Laurent Destailleur
|
4adf5fc1b9
|
Merge pull request #1314 from FHenry/3.4
Remove useless code (the tag replacement into footer and header is already done by SetVar method)
|
2013-11-20 14:42:11 -08:00 |
|
Laurent Destailleur
|
a9d5363799
|
Merge pull request #1313 from altairis-fr/3.3
[Task 1144 ] Fix wrong max-length of produt ref
|
2013-11-20 14:33:57 -08:00 |
|
Florian Henry
|
f88e9425ec
|
Remove useless code (the tag replacement into footer and header is
already done by SetVar method)
|
2013-11-20 14:01:43 +01:00 |
|
Florian Henry
|
361d34f7db
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
|
2013-11-20 13:58:26 +01:00 |
|
Florian Henry
|
306a51f6bd
|
remove useless code (the tag replacement into footer and header is
already done by SetVar method)
|
2013-11-20 13:54:53 +01:00 |
|
Christophe Battarel
|
e654dac578
|
[Task 1144 ] Fix wrong max-length of produt ref
|
2013-11-20 10:33:06 +01:00 |
|
Laurent Destailleur
|
583a3dadb1
|
Merge pull request #1308 from FHenry/3.4
[ bug #1142 ] Set paiement on invoice
|
2013-11-19 11:43:21 -08:00 |
|
Florian Henry
|
68718c6100
|
Update changelog
|
2013-11-19 10:42:29 +01:00 |
|
Florian Henry
|
870b78fc19
|
[ bug #1142 ] Set paiement on invoice
|
2013-11-19 10:41:00 +01:00 |
|
Laurent Destailleur
|
3884c33535
|
Merge pull request #1304 from altairis-fr/3.4
Fix bad translation on margin config
|
2013-11-17 16:15:23 -08:00 |
|
Christophe Battarel
|
89a5638908
|
Fix bad translation on margin config
|
2013-11-17 12:59:33 +01:00 |
|
Laurent Destailleur
|
52b66a839b
|
Merge pull request #1296 from FHenry/3.4
Better nl_NL translation
|
2013-11-15 05:06:44 -08:00 |
|
Laurent Destailleur
|
ef9db84a88
|
Merge pull request #1297 from GPCsolutions/3.4-dbupgradefix
Sync db upgrade with db install to avoid silly upgrade errors
|
2013-11-15 05:05:01 -08:00 |
|
Laurent Destailleur
|
a92aa14459
|
Merge pull request #1299 from altairis-fr/3.4
fix wrong buy price update (confusion between entity and npr !)
|
2013-11-15 05:04:07 -08:00 |
|
Laurent Destailleur
|
4099038083
|
Merge pull request #1301 from aspangaro/3.4
Fix 3.4
|
2013-11-15 05:00:20 -08:00 |
|
aspangaro
|
200553c001
|
Update ChangeLog
|
2013-11-15 04:58:59 +01:00 |
|
aspangaro
|
8050f8e9fe
|
Fix problem field
|
2013-11-14 21:40:30 +01:00 |
|
aspangaro
|
e8c7bb9c62
|
Fix for language
|
2013-11-14 21:02:33 +01:00 |
|
aspangaro
|
4acb9f8cba
|
Merge branch 'upstream/3.4'
|
2013-11-14 20:59:53 +01:00 |
|
Christophe Battarel
|
d23130739b
|
update ChangeLog
|
2013-11-13 18:43:31 +01:00 |
|
Christophe Battarel
|
7dbe2bcf2c
|
fix wrong buy price update
|
2013-11-13 18:41:31 +01:00 |
|
Raphaël Doursenaud
|
4ad5413163
|
Sync db upgrade with db install to avoid silly upgrade errors
|
2013-11-12 15:36:51 +01:00 |
|
Florian Henry
|
5b7f2e0c53
|
Better nl_NL translation
|
2013-11-11 17:35:36 +01:00 |
|
Laurent Destailleur
|
0dfbfbc19a
|
Merge pull request #1293 from aspangaro/3.4
Fix for document cerfa into module Don
|
2013-11-10 14:58:39 -08:00 |
|
aspangaro
|
6b6855dff5
|
Fix for document cerfa into module Don
|
2013-11-10 06:37:08 +01:00 |
|
Laurent Destailleur
|
4b3778d116
|
Merge pull request #1292 from aspangaro/3.4
fix for language
|
2013-11-09 16:08:19 -08:00 |
|
Laurent Destailleur
|
4b26d8441b
|
Fix: Entry lost
|
2013-11-09 12:52:06 +01:00 |
|
aspangaro
|
9170259351
|
fix for language
|
2013-11-09 06:51:10 +01:00 |
|
Laurent Destailleur
|
b82cbf1385
|
Fix: current balance was visible when it should not
Conflicts:
htdocs/compta/bank/account.php
|
2013-11-06 15:35:10 +01:00 |
|
Laurent Destailleur
|
c7be0ee9e2
|
Merge pull request #1277 from grandoc/3.4
3.4
|
2013-11-04 10:41:30 -08:00 |
|
Laurent Destailleur
|
c41ac34356
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-11-04 15:01:31 +01:00 |
|
Laurent Destailleur
|
8653f3f026
|
Add missing Country UK.
|
2013-11-04 12:38:21 +01:00 |
|
Grand Philippe
|
59085d7331
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
|
2013-11-04 10:41:32 +01:00 |
|
Grand Philippe
|
aaf1dd1b27
|
fix some language error
|
2013-11-04 10:41:02 +01:00 |
|
Laurent Destailleur
|
b2df689669
|
Merge pull request #1274 from FHenry/3.4
USe good status icon for thirdparty ActivityCeased
|
2013-11-03 13:18:37 -08:00 |
|
Laurent Destailleur
|
8105021cfd
|
Merge pull request #1275 from grandoc/3.4
missing trad and fix language
|
2013-11-03 13:17:56 -08:00 |
|
Grand Philippe
|
c5f29e14a4
|
missing trad and fix language
|
2013-11-02 17:50:24 +01:00 |
|
Florian Henry
|
6aea0bf7a1
|
Fix [ bug #1105 ] Searching Boxes other search option
|
2013-11-02 12:49:37 +01:00 |
|
Florian Henry
|
a4ce2d5f72
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
|
2013-11-02 02:25:33 +01:00 |
|
Florian Henry
|
662f48ddc2
|
Use good icons
|
2013-11-02 02:21:45 +01:00 |
|
Laurent Destailleur
|
e8a80e2365
|
Now comments in changelog are concatenated
|
2013-11-01 17:46:57 +01:00 |
|
Laurent Destailleur
|
84b36d1230
|
Prepare for 3.4.2
|
2013-11-01 17:24:09 +01:00 |
|