Laurent Destailleur
|
333d5fe1ca
|
Debug script to clean emails
|
2020-12-03 17:45:38 +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 |
|
Laurent Destailleur
|
450aa7cbea
|
Merge pull request #15597 from dolibit-ut/patch-51
Update llx_accounting_abc.sql
|
2020-12-02 19:47:19 +01:00 |
|
Laurent Destailleur
|
589da1d4b9
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-12-02 19:40:19 +01:00 |
|
Laurent Destailleur
|
bc1dc1e9f0
|
FIX #15590 manually
|
2020-12-02 19:34:04 +01:00 |
|
Laurent Destailleur
|
4c8043bd9f
|
Merge pull request #15598 from dolibit-ut/patch-52
Update llx_const.sql
|
2020-12-02 19:17:31 +01:00 |
|
Laurent Destailleur
|
8fde4f245a
|
Merge pull request #15601 from c3do/patch-17
NEW API: Get the list of ordering reasons
|
2020-12-02 19:17:04 +01:00 |
|
Laurent Destailleur
|
8ace020ba8
|
Update api_setup.class.php
|
2020-12-02 19:16:42 +01:00 |
|
Laurent Destailleur
|
37b6a15dbb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-02 19:13:44 +01:00 |
|
Laurent Destailleur
|
d88173d7ba
|
Fix bad column
|
2020-12-02 19:13:32 +01:00 |
|
Laurent Destailleur
|
8d64485705
|
Merge pull request #15623 from Dolibarr/revert-15607-12edit-extrafield-computed-multiline
Revert "Create/Edit extra-field with multi-line text area for computed value"
|
2020-12-02 18:56:06 +01:00 |
|
Laurent Destailleur
|
a2dca42965
|
Revert "Create/Edit extra-field with multi-line text area for computed value"
|
2020-12-02 18:55:55 +01:00 |
|
Laurent Destailleur
|
4918b41384
|
Merge pull request #15607 from StephaneLesage/12edit-extrafield-computed-multiline
Create/Edit extra-field with multi-line text area for computed value
|
2020-12-02 18:55:47 +01:00 |
|
Laurent Destailleur
|
9d2a78003e
|
Merge pull request #15606 from Zebedeu/develop
New add VAT RAT for Angola
|
2020-12-02 18:34:32 +01:00 |
|
Laurent Destailleur
|
662fe4c358
|
Merge pull request #15611 from StephaneLesage/12more_llx_c_shipment_mode.sql
More transporters in llx_c_shipment_mode.sql
|
2020-12-02 18:33:48 +01:00 |
|
Laurent Destailleur
|
864642e323
|
Merge pull request #15613 from dolibit-ut/patch-53
Update ChangeLog
|
2020-12-02 18:32:40 +01:00 |
|
Laurent Destailleur
|
38b67b0de6
|
Merge pull request #15616 from dolibit-ut/patch-54
Update llx_accounting_account_ca.sql
|
2020-12-02 18:31:58 +01:00 |
|
Laurent Destailleur
|
fd56f5fa21
|
Merge pull request #15621 from Hystepik/develop#1
Fix a bug in bank's graph with option and mode
|
2020-12-02 18:31:16 +01:00 |
|
Frédéric FRANCE
|
6440dcbd93
|
doxygen
|
2020-12-02 18:21:13 +01:00 |
|
Laurent Destailleur
|
9e18997e64
|
FIX #15595
|
2020-12-02 16:35:43 +01:00 |
|