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 |
|
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 |
|
Laurent Destailleur
|
ecb1f490ae
|
Fix: Option drop tables was broken
|
2013-11-01 17:20:36 +01:00 |
|
Florian Henry
|
987c09b882
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
|
2013-11-01 14:21:25 +01:00 |
|
Florian Henry
|
399093f501
|
USe good status icon for thirdparty ActivityCeased
|
2013-11-01 13:48:22 +01:00 |
|
Laurent Destailleur
|
4d10540600
|
Merge pull request #1272 from altairis-fr/rounding
fix bad rounding on margin calculation and display
|
2013-10-31 04:40:41 -07:00 |
|
Laurent Destailleur
|
e6ed902c63
|
Merge pull request #1267 from FHenry/3.4
Add nl_NL margin translation
|
2013-10-31 04:38:15 -07:00 |
|
Christophe Battarel
|
ba0273ccc4
|
fix bad rounding on margin calculation and display
|
2013-10-30 18:17:37 +01:00 |
|
Florian Henry
|
55046e2caf
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
|
2013-10-30 09:07:14 +01:00 |
|
Laurent Destailleur
|
d6b2d44350
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-10-29 23:51:46 +01:00 |
|
Laurent Destailleur
|
5fbb967941
|
Fix: restart of mysql for opensuse
|
2013-10-29 22:57:51 +01:00 |
|
Florian Henry
|
ad2a8d39c5
|
Add nl_NL margin translation
|
2013-10-27 13:30:35 +01:00 |
|
Laurent Destailleur
|
686babd0dc
|
Merge pull request #1265 from FHenry/3.4
Fix bad display IE for checkbox extrafield readonly
|
2013-10-26 17:15:00 -07:00 |
|
Florian Henry
|
17df92c654
|
Fix [ bug #1116 ] Silent Warning when validating a customer invoice
[PostgreSQL]
|
2013-10-26 16:01:02 +02:00 |
|