Juanjo Menent
|
3e45cab352
|
Merge pull request #3389 from aspangaro/develop-57
New: Add number of expense reports to pay in dashboard and a grace period
|
2015-08-30 09:02:07 +02:00 |
|
aspangaro
|
e4bac2adfd
|
Merge remote-tracking branch 'Upstream/develop' into develop-57
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
|
2015-08-30 07:39:45 +02:00 |
|
Juanjo Menent
|
25fca6615a
|
Merge pull request #3395 from fmarcet/develop
NEW: Translate extrafield's labels
|
2015-08-28 16:44:49 +02:00 |
|
Juanjo Menent
|
c09b130644
|
Merge pull request #3403 from defrance/patch-76
NEW add in get_origin function generic origintype
|
2015-08-28 16:28:59 +02:00 |
|
Juanjo Menent
|
b058d39bb4
|
Merge pull request #3419 from aspangaro/develop-61
Increase length of column pcg_version to 32 for accountancy system
|
2015-08-28 16:26:26 +02:00 |
|
Laurent Destailleur
|
39cbd7629f
|
Fix error message during import
|
2015-08-27 23:49:25 +02:00 |
|
Laurent Destailleur
|
aec3976741
|
Fix set ref
|
2015-08-27 22:48:52 +02:00 |
|
Laurent Destailleur
|
302b61c5ce
|
Fix Can't download generated document for cheque summary deposit.
|
2015-08-27 22:43:09 +02:00 |
|
aspangaro
|
134bd42c4e
|
Increase length of column pcg_version to 32
|
2015-08-27 15:13:29 +02:00 |
|
Juanjo Menent
|
ddb9c6a025
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-26 21:01:39 +02:00 |
|
Juanjo Menent
|
0a33f0728a
|
Fix translations of contract exports
|
2015-08-26 21:01:01 +02:00 |
|
Juanjo Menent
|
4cd61073e2
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-26 20:26:27 +02:00 |
|
Juanjo Menent
|
6321e96e49
|
Close #3223
|
2015-08-26 20:25:52 +02:00 |
|
Laurent Destailleur
|
6e7ab5a32f
|
Merge pull request #3406 from aspangaro/develop-58
Update php-iban library - Just number version update
|
2015-08-26 11:30:33 +02:00 |
|
Laurent Destailleur
|
603c44c37c
|
Merge pull request #3405 from aspangaro/3.8-13
Fast review 3.8
|
2015-08-26 11:27:16 +02:00 |
|
Laurent Destailleur
|
0a880cd205
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2015-08-26 11:26:00 +02:00 |
|
Laurent Destailleur
|
3fc63eba0d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-08-26 11:25:05 +02:00 |
|
Laurent Destailleur
|
edf05e8d94
|
Merge pull request #3404 from hregis/3.7_bug
Fix: disable hook for avoid errors when object langs is disable
|
2015-08-26 11:24:50 +02:00 |
|
Laurent Destailleur
|
3db021addf
|
Fix Use correct boolean type.
Complete doxygen
|
2015-08-26 11:24:31 +02:00 |
|
Juanjo Menent
|
9deaa3cceb
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-25 22:01:33 +02:00 |
|
Juanjo Menent
|
f32a7ba228
|
Close #3224
|
2015-08-25 21:59:46 +02:00 |
|
aspangaro
|
73d8f20c6b
|
Fix: Correct directory where the donation is generated & add the action to remove_file who are generated
|
2015-08-25 08:09:14 +02:00 |
|
Laurent Destailleur
|
a54589c13c
|
Fix filter lost
|
2015-08-24 17:47:26 +02:00 |
|
Laurent Destailleur
|
09355b0c7b
|
Fix filtering
|
2015-08-24 16:40:43 +02:00 |
|
Laurent Destailleur
|
2cf10ac05d
|
Fix filtering
|
2015-08-24 16:32:43 +02:00 |
|
Laurent Destailleur
|
8061ec9084
|
Fix translation
|
2015-08-24 15:59:17 +02:00 |
|
Laurent Destailleur
|
aaba18bd51
|
Fix filter on date
|
2015-08-24 15:40:33 +02:00 |
|
Laurent Destailleur
|
32ec57403b
|
Bad translation
|
2015-08-24 15:28:15 +02:00 |
|
Laurent Destailleur
|
1a55159e35
|
Fix filter on prospect status
|
2015-08-24 14:59:46 +02:00 |
|
Laurent Destailleur
|
80fc4743c9
|
Fix the property "list" was not used.
|
2015-08-24 14:42:07 +02:00 |
|
Laurent Destailleur
|
e17abbb59a
|
Fix syntax error
|
2015-08-24 12:26:49 +02:00 |
|
Laurent Destailleur
|
feed3f714c
|
Fix to avoid warning
|
2015-08-24 11:17:11 +02:00 |
|
aspangaro
|
fabc771a80
|
Update php-iban library - Just docs update
|
2015-08-23 08:00:04 +02:00 |
|
aspangaro
|
478947d630
|
Correct
|
2015-08-23 07:46:37 +02:00 |
|
aspangaro
|
7d2eae2359
|
Fix: Better presentation for add form
|
2015-08-23 07:37:38 +02:00 |
|
BENKE Charlie
|
af7302fa90
|
change done
|
2015-08-23 00:30:11 +02:00 |
|
Regis Houssin
|
7b7fc44b46
|
Fix: disable hook for avoid errors when object langs is disable
|
2015-08-22 09:24:46 +02:00 |
|
BENKE Charlie
|
1b117d5581
|
add in get_origin function generic origintype
actually we have only internal module origintype
propose to add feature to add stockmovement from other external module
|
2015-08-21 14:10:55 +02:00 |
|
Laurent Destailleur
|
15ab9c0ecd
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/stock/mouvement.php
|
2015-08-20 16:08:42 +02:00 |
|
Laurent Destailleur
|
da8e71b2c5
|
Fix #3309
|
2015-08-20 16:05:29 +02:00 |
|
Laurent Destailleur
|
1b409538a8
|
Fix #3400
Conflicts:
htdocs/core/lib/date.lib.php
|
2015-08-20 15:51:28 +02:00 |
|
Laurent Destailleur
|
4541d189ac
|
Fix #3400
|
2015-08-20 15:50:00 +02:00 |
|
Laurent Destailleur
|
18f064cc69
|
Fix login is a mandatory field.
|
2015-08-20 15:18:36 +02:00 |
|
Laurent Destailleur
|
d409568442
|
Format code
|
2015-08-20 15:07:16 +02:00 |
|
Laurent Destailleur
|
e24fd6fa37
|
Merge remote-tracking branch 'origin/develop' into 3.8
Conflicts:
htdocs/expedition/class/expedition.class.php
|
2015-08-20 14:36:32 +02:00 |
|
Laurent Destailleur
|
c3fb14855b
|
Try a better fix to replace PR #3297
|
2015-08-20 14:34:48 +02:00 |
|
Laurent Destailleur
|
d90b342cc9
|
Fix use dedicated escapment function
|
2015-08-20 14:34:08 +02:00 |
|
Laurent Destailleur
|
2266c2806f
|
Merge pull request #3396 from fappels/3.8
Fix shipment validation: 2 times qty in SQL select
|
2015-08-20 14:32:34 +02:00 |
|
Laurent Destailleur
|
936f912216
|
Fix filter on category
|
2015-08-20 04:07:07 +02:00 |
|
Laurent Destailleur
|
26e3fcc636
|
Try a better fix to replace PR #3297
|
2015-08-20 03:38:21 +02:00 |
|