Laurent Destailleur
|
6c8a6aa81f
|
Merge pull request #15641 from denis-poncereau/develop
Corrected "cash fence" to "cash desk closing" on english .lang files
|
2020-12-04 16:00:57 +01:00 |
|
Laurent Destailleur
|
f0dec80dae
|
css
|
2020-12-04 15:39:30 +01:00 |
|
Laurent Destailleur
|
2e5ac9b40a
|
CSS
|
2020-12-04 15:36:14 +01:00 |
|
Laurent Destailleur
|
e7306625f0
|
Fix look and feel v13
|
2020-12-04 15:28:12 +01:00 |
|
Laurent Destailleur
|
6d4a90b543
|
Clean code
|
2020-12-04 14:53:52 +01:00 |
|
Laurent Destailleur
|
c8f918265a
|
Removed dead code
|
2020-12-04 13:25:56 +01:00 |
|
Laurent Destailleur
|
34679c3bc1
|
Fix warning in phpunit
|
2020-12-04 13:22:47 +01:00 |
|
Laurent Destailleur
|
0d4121c5bd
|
Fix warning
|
2020-12-04 12:01:41 +01:00 |
|
Denis
|
2173b8566e
|
Corrected "cash fence" to "cash desk closing" on english .lang files
|
2020-12-04 10:58:29 +01:00 |
|
Laurent Destailleur
|
040d22ef0a
|
Fix phpcs
|
2020-12-04 01:59:47 +01:00 |
|
Laurent Destailleur
|
6b0092c30a
|
Several minor bugfixes. Hide option TAKEPOS_NUMPAD_USE_PAYMENT_ICON.
|
2020-12-04 00:58:51 +01:00 |
|
Laurent Destailleur
|
53bf854792
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-03 23:51:00 +01:00 |
|
Laurent Destailleur
|
e7adde4019
|
css
|
2020-12-03 23:50:45 +01:00 |
|
Laurent Destailleur
|
ebaf9928ae
|
Merge pull request #15631 from frederic34/patch-8
doxygen
|
2020-12-03 20:46:56 +01:00 |
|
Laurent Destailleur
|
0db72852fb
|
Fix height of graph
|
2020-12-03 20:18:37 +01:00 |
|
Laurent Destailleur
|
1ff55100d4
|
Fix use combobox for warehousr selection
|
2020-12-03 19:13:40 +01:00 |
|
Laurent Destailleur
|
210ccc4b43
|
FIX Missing very important performance indexes
|
2020-12-03 18:34:32 +01:00 |
|
Laurent Destailleur
|
333d5fe1ca
|
Debug script to clean emails
|
2020-12-03 17:45:38 +01:00 |
|
Frédéric FRANCE
|
e3037c7e1a
|
doxygen
|
2020-12-03 17:33:22 +01:00 |
|
Laurent Destailleur
|
56d56929ec
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/dolibarr.php
|
2020-12-03 16:39:22 +01:00 |
|
Laurent Destailleur
|
c8eaa4743c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-12-03 16:35:56 +01:00 |
|
Laurent Destailleur
|
ac29db92cb
|
FIX #15618
|
2020-12-03 16:35:42 +01:00 |
|
Laurent Destailleur
|
f06d920460
|
FIX #15583
|
2020-12-03 16:22:03 +01:00 |
|
Laurent Destailleur
|
d8d825f615
|
FIX #15519
|
2020-12-03 14:40:14 +01:00 |
|
Laurent Destailleur
|
d53f0af362
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-03 14:34:30 +01:00 |
|
Laurent Destailleur
|
5bd6d6f388
|
Look and feel v13
|
2020-12-03 14:34:15 +01:00 |
|
Laurent Destailleur
|
701d7668a5
|
Merge pull request #15617 from teleassist/teleassist-takepos-numpadLabelsForIcons
NEW Takepos - Add labels to icons in Numpad
|
2020-12-03 14:32:02 +01:00 |
|
Laurent Destailleur
|
1f58b49aea
|
No xml inside HTML
|
2020-12-03 14:31:39 +01:00 |
|
Laurent Destailleur
|
35766fb5bf
|
Merge pull request #15625 from atm-florianm/FIX/12.0_error_when_adding_lines_on_order
FIX 12.0 - error when displaying lines on order after adding a new line
|
2020-12-03 14:30:25 +01:00 |
|
Laurent Destailleur
|
068587fcee
|
Update card.php
|
2020-12-03 14:30:07 +01:00 |
|
Laurent Destailleur
|
1ec3d4cfdf
|
CSS
|
2020-12-03 13:19:35 +01:00 |
|
Laurent Destailleur
|
bfe4eb7309
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
|
2020-12-03 11:26:53 +01:00 |
|
Laurent Destailleur
|
af4f473c93
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/boxes/box_produits.php
|
2020-12-03 11:22:34 +01:00 |
|
Laurent Destailleur
|
0ad6ee209a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-12-03 11:21:08 +01:00 |
|
Laurent Destailleur
|
b324425db8
|
code comment
|
2020-12-03 11:19:41 +01:00 |
|
Laurent Destailleur
|
0fd865d8af
|
FIX Better error message with IMAP when connection fails
|
2020-12-03 11:16:02 +01:00 |
|
Laurent Destailleur
|
748630eb25
|
FIX Better error message when IMAP connection fails
|
2020-12-03 11:15:06 +01:00 |
|
Laurent Destailleur
|
3d21a00f2b
|
Removed not working code
|
2020-12-03 11:03:02 +01:00 |
|
Laurent Destailleur
|
56d5cd0402
|
Fix missing .php into name of boxes added into llx_boxes_def
|
2020-12-03 10:22:53 +01:00 |
|
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 |
|
Laurent Destailleur
|
dd54d28dc6
|
Debug v13
|
2020-12-03 10:13:13 +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 |
|
Laurent Destailleur
|
2891cadb20
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-03 09:23:27 +01:00 |
|
Laurent Destailleur
|
1343fb48db
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2020-12-03 00:40:56 +01:00 |
|
Laurent Destailleur
|
9137713056
|
Debug v13
|
2020-12-03 00:40:41 +01:00 |
|
Florian Mortgat
|
17d5bb5cd4
|
FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated
|
2020-12-02 22:25:08 +01:00 |
|
Laurent Destailleur
|
b48a1d4c3e
|
Merge pull request #15622 from frederic34/patch-8
doxygen
|
2020-12-02 22:04:52 +01:00 |
|
Laurent Destailleur
|
46171a6ec8
|
Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT
|
2020-12-02 21:27:15 +01:00 |
|