Laurent Destailleur
|
c3b51b177e
|
Merge pull request #13327 from OPEN-DSI/new-takepos-auto-print-ticket-paid
NEW only auto print paid ticket in cash desk
|
2020-03-11 20:07:50 +01:00 |
|
Laurent Destailleur
|
ea0fd546c7
|
Fix phpcs
|
2020-03-11 19:37:43 +01:00 |
|
Laurent Destailleur
|
20a695de2b
|
Restore cron
|
2020-03-11 19:33:12 +01:00 |
|
Laurent Destailleur
|
4c87a60d6c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-11 19:27:33 +01:00 |
|
Laurent Destailleur
|
0f2fe30e41
|
Try action
|
2020-03-11 19:27:23 +01:00 |
|
Laurent Destailleur
|
5d5b2b8183
|
Merge pull request #13328 from OPEN-DSI/new-takepos-payment-method
NEW set payment method on paid ticket in cash desk
|
2020-03-11 19:26:10 +01:00 |
|
Laurent Destailleur
|
8f1a5c96ac
|
Test
|
2020-03-11 19:23:45 +01:00 |
|
Laurent Destailleur
|
8edcdc742f
|
Real run
|
2020-03-11 19:23:00 +01:00 |
|
Laurent Destailleur
|
18bd2d51e7
|
Test unstale
|
2020-03-11 19:21:21 +01:00 |
|
Laurent Destailleur
|
71c5c77813
|
Test unstale
|
2020-03-11 19:21:10 +01:00 |
|
Laurent Destailleur
|
bf3ff713e4
|
Text
|
2020-03-11 19:20:20 +01:00 |
|
Laurent Destailleur
|
1c889b8de1
|
Test unstale
|
2020-03-11 19:19:21 +01:00 |
|
Laurent Destailleur
|
39ba08981a
|
Try unstale
|
2020-03-11 18:39:47 +01:00 |
|
Laurent Destailleur
|
19dca1dbaa
|
Try to fix setup
|
2020-03-11 18:29:38 +01:00 |
|
Laurent Destailleur
|
fb73e00346
|
Use version in master
|
2020-03-11 18:24:24 +01:00 |
|
Laurent Destailleur
|
fc05e8d768
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
|
2020-03-11 18:03:15 +01:00 |
|
Laurent Destailleur
|
d6535c0584
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-11 17:56:58 +01:00 |
|
Laurent Destailleur
|
58643d2dad
|
WIP
|
2020-03-11 17:56:47 +01:00 |
|
VESSILLER
|
5d740d16fb
|
NEW set payment method on paid ticket in cash desk
|
2020-03-11 17:42:30 +01:00 |
|
Laurent Destailleur
|
61cb1ec81a
|
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
NEW : Allow extrafields on pdf : extend to line desc
|
2020-03-11 17:12:14 +01:00 |
|
Laurent Destailleur
|
89a8531140
|
Merge pull request #13237 from aspangaro/12.0_a18
NEW: Accountancy - Add mode intra & export for product or service bought
|
2020-03-11 17:08:49 +01:00 |
|
Laurent Destailleur
|
4088553d61
|
Merge pull request #13321 from OPEN-DSI/new-takepos-product-sorted-by-label
NEW add a parameter to sort product by label in cash desk
|
2020-03-11 17:07:30 +01:00 |
|
Laurent Destailleur
|
40973cfca9
|
Merge pull request #13320 from OPEN-DSI/new-takepos-search-on-keycode
New takepos search on keycode
|
2020-03-11 17:07:03 +01:00 |
|
Laurent Destailleur
|
8609bf9c9c
|
Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons
NEW add icon on payment buttons in cash desk
|
2020-03-11 17:06:04 +01:00 |
|
Laurent Destailleur
|
57440cc0dd
|
Merge pull request #13311 from OPEN-DSI/new-takepos-categories-sorted
NEW categories and subcategories sorted by label in TakePOS
|
2020-03-11 17:05:40 +01:00 |
|
Laurent Destailleur
|
4903287204
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/boxes/box_commandes.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-03-11 17:04:28 +01:00 |
|
Laurent Destailleur
|
27bdee9df1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-03-11 17:01:47 +01:00 |
|
Laurent Destailleur
|
c9b715b7ad
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-03-11 17:01:31 +01:00 |
|
Laurent Destailleur
|
7afbb5ce9c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2020-03-11 17:00:01 +01:00 |
|
Laurent Destailleur
|
467dc2da7a
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2020-03-11 16:59:35 +01:00 |
|
Laurent Destailleur
|
21dbddac76
|
Merge pull request #13317 from TobiasSekan/FixErrorOnAddLineToOrder
FIX Error on add a new line to a supplier order (with ODT templates)
|
2020-03-11 16:58:44 +01:00 |
|
VESSILLER
|
e95e182419
|
NEW only auto print paid ticket in cash desk
|
2020-03-11 16:53:27 +01:00 |
|
Laurent Destailleur
|
a9847f0d40
|
Merge pull request #13308 from TobiasSekan/NewCategoryFilterForBankList
NEW category filter for bank list
|
2020-03-11 16:50:12 +01:00 |
|
Laurent Destailleur
|
36e6dd9d8e
|
Merge pull request #13254 from Tim-Otte/add-odt-converter
NEW Support some HTML contents into ODT documents
|
2020-03-11 16:49:39 +01:00 |
|
Laurent Destailleur
|
a25cf8448d
|
Merge pull request #13306 from andreubisquerra/develop
Black head bar with Colorfull TakePOS theme
|
2020-03-11 16:48:05 +01:00 |
|
Laurent Destailleur
|
7e574e0429
|
Fix permissions
|
2020-03-11 16:47:42 +01:00 |
|
Laurent Destailleur
|
4bdf10c995
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2020-03-11 16:44:03 +01:00 |
|
Laurent Destailleur
|
ae5d94b01c
|
Merge pull request #13323 from aspangaro/11.0_p5
Fix accounting files link on auguria menu
|
2020-03-11 16:43:10 +01:00 |
|
Laurent Destailleur
|
27e32fc353
|
Merge pull request #13305 from andreubisquerra/master
Move customer name to TakePOS headbar
|
2020-03-11 16:42:32 +01:00 |
|
Laurent Destailleur
|
13ffc186b7
|
Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
|
2020-03-11 16:41:24 +01:00 |
|
Laurent Destailleur
|
b821225382
|
Merge pull request #13326 from OPEN-DSI/new-takepos-reduction-global
NEW add global reduction in cash desk
|
2020-03-11 16:40:34 +01:00 |
|
Laurent Destailleur
|
8808b7df87
|
Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes
FIX 10.0 - missing translations for "orders" homepage "orders" box
|
2020-03-11 16:39:43 +01:00 |
|
Laurent Destailleur
|
7f759c6ff5
|
Merge pull request #13322 from atm-lena/6.0_FIX_FournCommandClone_ExtrafieldsLines
FIX - Clone Fourn Command, add line's extrafields
|
2020-03-11 16:36:27 +01:00 |
|
Laurent Destailleur
|
838b6d1e71
|
Merge pull request #13316 from atm-florian/11.0
fix PHP Fatal error: Uncaught Error: Call to undefined function newToken()
|
2020-03-11 16:34:59 +01:00 |
|
Laurent Destailleur
|
25eae4db9c
|
Fix missing __USER_EMAIL__ substitution
|
2020-03-11 16:28:00 +01:00 |
|
Laurent Destailleur
|
2b8a06cb5e
|
FIX unit price for selected supplier products not set. NaN was used.
|
2020-03-11 16:12:34 +01:00 |
|
Laurent Destailleur
|
5adec1fe32
|
FIX unit price for selected supplier products not set. NaN was used.
|
2020-03-11 16:11:38 +01:00 |
|
Laurent Destailleur
|
c8bbaa07fd
|
FIX Look and feel v11
|
2020-03-11 15:53:08 +01:00 |
|
VESSILLER
|
fc4a98b29c
|
NEW add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
|
2020-03-11 15:36:36 +01:00 |
|
atm-lena
|
20aa51f26b
|
FIX - Clone Fourn Command, add line's extrafields Part 2
|
2020-03-11 15:26:49 +01:00 |
|