Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Laurent Destailleur
0ef17fe581
FIX Problems with permissions of module to record payment of salaries
2018-09-07 13:32:56 +02:00
Philippe GRAND
d673848028
standardize
2018-07-30 17:28:44 +02:00
Philippe GRAND
a937d9e657
clean code
2018-06-13 22:52:24 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs
2018-05-27 09:27:09 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
857b59409c
FIX sql syntax error because of old field accountancy_journal
2017-10-13 01:50:00 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
35d80aa209
Miscellaneous fixes
2016-11-12 12:40:06 +01:00
aspangaro
31a895dddc
Merge remote-tracking branch 'Upstream/develop' into 5.0-p1
2016-08-29 21:21:10 +02:00
aspangaro
5eb0e4ad87
Fix: Presentation on salaries payment index
2016-08-29 21:14:11 +02:00
Laurent Destailleur
86c90ade3f
Another fix on bank account missing when bank module enabled.
2016-08-11 18:41:31 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
25b7f0ab62
FIX Remove a total that has no sense
2016-04-22 17:11:12 +02:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
52c82508e4
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/charges/index.php
2016-02-18 23:27:57 +01:00
Laurent Destailleur
9796b1b268
Can select number of records into lists
2016-02-16 17:43:05 +01:00
aspangaro
d4057c3feb
Fixed: Correct problem of rights beetween tax and salaries module
2016-02-15 06:56:51 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
192fdbdcc4
Minor look uniformization
2015-11-14 23:10:12 +01:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
jfefe
22c3406498
Change title images for accountancy section
2015-04-18 23:17:47 +02:00
Laurent Destailleur
dc30092290
Add column to store salary ref when doing payment.
2015-03-10 10:11:51 +01:00
Laurent Destailleur
dc4a874e70
Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors
2014-12-25 12:08:10 +01:00
Laurent Destailleur
4a60d57544
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/fiche.php
htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Laurent Destailleur
cbbe909bc5
Fix: Pb in management of "or" ("|") for permission check.
2014-10-12 15:22:07 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
Juanjo Menent
747b6a9f94
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports
...
and payments
2014-07-04 12:50:55 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
f95c87f1d6
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 18:57:04 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
c45f509984
Qual: Uniformizing payments
2014-03-26 15:41:09 +01:00
Laurent Destailleur
4828d1e89a
New: Uniformize visible information on payment lists.
2014-03-25 20:24:51 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
aspangaro
12ffb19cec
Use more explicit name for class and functions
2014-03-11 06:26:18 +01:00
