aspangaro
cb189ed83e
Add salary payment
2014-09-02 05:10:25 +02:00
Juanjo Menent
cc858b2af0
Fix SQL syntax
...
ChangeLog
2014-09-01 22:41:36 +02:00
Juanjo Menent
2d0f353529
Merge pull request #1859 from FHenry/3.6
...
Fix SQL syntax
2014-09-01 22:26:21 +02:00
Florian HENRY
e2fac5dd91
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
...
Conflicts:
ChangeLog
2014-09-01 19:10:18 +02:00
Juanjo Menent
e6a387cb65
Merge pull request #1856 from aspangaro/develop-patch1
...
Typo
2014-09-01 18:44:09 +02:00
Florian HENRY
772acd6bf9
Fix missing $user in create method
2014-09-01 18:32:36 +02:00
Juanjo Menent
1f0653dd6d
Merge pull request #1860 from FHenry/3.5
...
Fix missing $user in create method
2014-09-01 18:31:22 +02:00
Juanjo Menent
dc46d59d68
Fix: Unsubscribe emailing not working
2014-09-01 18:26:24 +02:00
Juanjo Menent
4372c58714
Fix: Unsubscribe emailing not working
2014-09-01 18:24:25 +02:00
Florian HENRY
db1c97bdad
changelog
2014-09-01 11:52:20 +02:00
Florian HENRY
0473bc5138
Fix missing $user into create call categorie
2014-09-01 11:51:16 +02:00
Florian HENRY
bff33166a5
Fix missing $user in create method
2014-09-01 11:49:44 +02:00
Laurent Destailleur
f245f43a3f
Doxygen
2014-08-31 23:18:09 +02:00
Laurent Destailleur
f2affade35
Doxygen
2014-08-31 23:06:58 +02:00
Laurent Destailleur
de548ba610
Doxygen
2014-08-31 23:01:49 +02:00
Laurent Destailleur
6e54577167
Better error management
2014-08-31 15:09:10 +02:00
aspangaro
def53d92bd
Correct error menu
2014-08-31 14:10:48 +02:00
aspangaro
6d3b166340
Update dynamics menu
2014-08-31 13:58:42 +02:00
aspangaro
c5a36f67ec
Key language
2014-08-31 13:57:54 +02:00
aspangaro
18a6a3f499
Update langs - Tks Juanjo for es_ES
2014-08-31 13:57:30 +02:00
Florian HENRY
fd03f582c9
Fix SQL syntax
2014-08-31 12:38:33 +02:00
aspangaro
f9076162b6
Add dynamic link into accountancy menu to bank journal
2014-08-31 08:56:22 +02:00
aspangaro
bf5d2ec336
Add trigger on delete accounting document
2014-08-31 08:55:10 +02:00
aspangaro
9f92446dba
Merge branch 'Upstream/develop'
2014-08-31 07:44:46 +02:00
aspangaro
0721974c05
Correct travis & licence
2014-08-31 07:41:55 +02:00
Drosis Nikos
445bac25fe
Can change size of Logo picture
2014-08-30 23:57:37 +03:00
Laurent Destailleur
154d1520fb
Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1
2014-08-30 20:36:53 +02:00
Laurent Destailleur
20475ba3e8
Fix: sql request not compatible with pgsql
...
Conflicts:
htdocs/core/ajax/ziptown.php
2014-08-30 20:19:27 +02:00
Laurent Destailleur
0ccd29c6cd
Doxygen
2014-08-30 20:05:16 +02:00
Laurent Destailleur
5738d6de98
Fix: sql request not compatible with pgsql
2014-08-30 20:04:53 +02:00
Laurent Destailleur
2d14e53b45
Fix: Pb with pgsql
2014-08-30 20:00:42 +02:00
Laurent Destailleur
f6be7d7930
Fix: Pb with pgsql
2014-08-30 19:58:38 +02:00
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
jfefe
b7a2e3783e
Fix : missing translations
2014-08-30 11:11:51 +02:00
jfefe
71afc4adb0
Fix : missing actions for resource element
2014-08-30 11:11:32 +02:00
jfefe
2c68317864
Fix : bad sql request when linking resource to an element
2014-08-30 10:23:58 +02:00
aspangaro
3b8a3ccb14
Correct travis
2014-08-30 07:37:01 +02:00
aspangaro
d3a14c514a
Correct travis
2014-08-30 07:11:28 +02:00
aspangaro
6bad77d8fb
Move script
2014-08-30 06:46:42 +02:00
aspangaro
74ef9d5c59
Changelog
2014-08-30 06:22:18 +02:00
aspangaro
d6b2cb0b31
Correct travis
2014-08-30 06:05:02 +02:00
aspangaro
cc9f26a035
Correct travis
2014-08-30 05:44:12 +02:00
aspangaro
b27cf2cbd6
Merge branch 'Upstream/develop'
2014-08-30 05:30:53 +02:00
aspangaro
b25db97c28
Typo
2014-08-30 05:30:37 +02:00
aspangaro
1a7c88751c
Correct travis
2014-08-30 05:19:48 +02:00
aspangaro
07377e7156
Merge branch 'Upstream/develop'
2014-08-30 04:42:36 +02:00
Laurent Destailleur
47339d0e62
Fix: Missing field tobuy into service export.
...
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:26:27 +02:00
Laurent Destailleur
5dc35ec137
Fix: Missing field tobuy into service export.
...
Fix: Filter on date into export.
Fix: Tooltip help.
2014-08-29 20:25:54 +02:00
Philippe GRAND
a448b7e36a
add product minimum recommended price
2014-08-29 19:19:26 +02:00
Damian Serrano Thode
4fe83ebbf9
Contract never shown on interventions
...
Column fk_contrat is never read from the database, so it is never shown
in the corresponding field of the intervention, even though you have set
it choosing the contract from the dropdown.
2014-08-29 11:34:07 +02:00