teleassist
|
b75a5f596e
|
Merge branch 'teleassist-takepos-numpadLabelsForIcons' of https://github.com/teleassist/dolibarr into teleassist-takepos-numpadLabelsForIcons
|
2020-12-03 10:13:55 +01:00 |
|
teleassist
|
f6adb6ae55
|
Update pay.php
Always show labels with payment icons
|
2020-12-03 10:12:03 +01:00 |
|
teleassist
|
450b04c1ad
|
Revert "Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS"
This reverts commit 7e9a12a2f8.
|
2020-12-03 10:04:28 +01:00 |
|
teleassist
|
62e3b5d214
|
Revert "Add translation"
This reverts commit e19d0c9eea.
|
2020-12-03 10:04:21 +01:00 |
|
stickler-ci
|
87ee62c2ff
|
Fixing style errors.
|
2020-12-02 08:54:33 +00:00 |
|
teleassist
|
dd2d5259de
|
Add icons labels for payment buttons
Add labels to icons when TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS is set
|
2020-12-02 09:46:53 +01:00 |
|
teleassist
|
0730cab90f
|
Add class for icons labels
|
2020-12-02 09:38:30 +01:00 |
|
teleassist
|
7e9a12a2f8
|
Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS
Add option TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS to show labels at the bottom of payment icons of the numpad
|
2020-12-02 09:19:18 +01:00 |
|
teleassist
|
e19d0c9eea
|
Add translation
Add translation for option TakeposNumpadForcePaymentLabels
|
2020-12-02 09:07:24 +01:00 |
|
Laurent Destailleur
|
a2ede3573e
|
Default selected columns
|
2020-11-30 08:46:58 +01:00 |
|
Laurent Destailleur
|
6ad7cca647
|
Fix sort columns
|
2020-11-30 08:45:16 +01:00 |
|
Laurent Destailleur
|
6af9c9f857
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-11-30 07:50:26 +01:00 |
|
Laurent Destailleur
|
b6ccfaf180
|
css
|
2020-11-30 07:50:14 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
58eaef37d2
|
Fix regression
|
2020-11-29 21:29:22 +01:00 |
|
Laurent Destailleur
|
6a8ddacb33
|
Prepare database to allow to disconnect other session after a password
change
|
2020-11-29 21:01:57 +01:00 |
|
Laurent Destailleur
|
de98ef1718
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2020-11-29 20:57:43 +01:00 |
|
Laurent Destailleur
|
d45fe6c17f
|
FIx #15551
|
2020-11-29 20:39:39 +01:00 |
|
Laurent Destailleur
|
d3a2aa664f
|
FIX #15572
|
2020-11-29 20:27:40 +01:00 |
|
Laurent Destailleur
|
66381a4f4d
|
FIX #15558
|
2020-11-29 19:41:11 +01:00 |
|
Laurent Destailleur
|
8eacbaaf5f
|
Merge pull request #15570 from frederic34/strike
simplify function
|
2020-11-29 19:10:06 +01:00 |
|
Laurent Destailleur
|
1e5062a161
|
Merge pull request #15569 from frederic34/patch-8
doxygen
|
2020-11-29 19:08:41 +01:00 |
|
Laurent Destailleur
|
5ad1bb5b20
|
Merge pull request #15571 from frederic34/patch-14
Update mod_codecompta_aquarium.php
|
2020-11-29 19:08:29 +01:00 |
|
Laurent Destailleur
|
c963624f25
|
css
|
2020-11-29 18:53:19 +01:00 |
|
Laurent Destailleur
|
beafcc7853
|
Fix warning
|
2020-11-29 16:06:03 +01:00 |
|
Laurent Destailleur
|
150dd71774
|
Look and feel v13
|
2020-11-29 16:02:39 +01:00 |
|
Laurent Destailleur
|
404634919d
|
Look and feel v13
|
2020-11-29 15:47:08 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Frédéric FRANCE
|
83c60d725a
|
Update mod_codecompta_aquarium.php
|
2020-11-28 23:45:32 +01:00 |
|
Frédéric FRANCE
|
3a041eed44
|
simplify function
|
2020-11-28 23:42:48 +01:00 |
|
Frédéric FRANCE
|
11a978ca08
|
simplify function
|
2020-11-28 23:41:44 +01:00 |
|
Frédéric FRANCE
|
eea9382b57
|
Update mod_codecompta_aquarium.php
|
2020-11-28 23:35:27 +01:00 |
|
Frédéric FRANCE
|
f9ef0f4d69
|
Update mod_codecompta_digitaria.php
|
2020-11-28 23:33:58 +01:00 |
|
Frédéric FRANCE
|
2f701f4889
|
Update mod_codecompta_aquarium.php
|
2020-11-28 23:24:13 +01:00 |
|
Frédéric FRANCE
|
fb871daf14
|
simplify function
|
2020-11-28 23:04:05 +01:00 |
|
Laurent Destailleur
|
e595f42a59
|
css
|
2020-11-28 19:34:28 +01:00 |
|
Laurent Destailleur
|
85a6a296c8
|
Fix links
|
2020-11-28 19:13:17 +01:00 |
|
Laurent Destailleur
|
fab9b3d50c
|
Fix warning
|
2020-11-28 18:34:13 +01:00 |
|
Frédéric FRANCE
|
4f52cd38b4
|
doxygen
|
2020-11-28 17:07:08 +01:00 |
|
Laurent Destailleur
|
df17c2f26a
|
Removed dead code generating warning.
CSS
|
2020-11-28 16:48:32 +01:00 |
|
Laurent Destailleur
|
147a12a922
|
Fix warning
|
2020-11-28 15:02:05 +01:00 |
|
Laurent Destailleur
|
535cfea03d
|
Exclude test
|
2020-11-28 14:49:59 +01:00 |
|
Laurent Destailleur
|
59b445a103
|
Clean dead code
|
2020-11-28 14:47:39 +01:00 |
|
Laurent Destailleur
|
41984f9934
|
Clean code
|
2020-11-28 14:00:35 +01:00 |
|
Laurent Destailleur
|
2989ff50fa
|
Fix syntax error
|
2020-11-28 13:52:52 +01:00 |
|
Laurent Destailleur
|
6afe5919b9
|
Merge pull request #15563 from iouston/patch-14
Add PROPAL_ENABLE_NEGATIVE
|
2020-11-28 13:35:57 +01:00 |
|
Laurent Destailleur
|
2fd1838425
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-28 12:27:34 +01:00 |
|
Laurent Destailleur
|
c03f43d5f0
|
Merge pull request #15568 from ptibogxiv/patch-395
New get permissions for connected user by API
|
2020-11-28 12:16:07 +01:00 |
|
Laurent Destailleur
|
b1603ed1f5
|
Fix warning
|
2020-11-28 12:12:31 +01:00 |
|
stickler-ci
|
0b408b8012
|
Fixing style errors.
|
2020-11-28 09:32:02 +00:00 |
|