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
|
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 |
|
Laurent Destailleur
|
65fbc24b36
|
Work on migration script
|
2020-03-11 14:53:06 +01:00 |
|
Laurent Destailleur
|
406c333849
|
Fix trans
|
2020-03-11 13:55:57 +01:00 |
|
Laurent Destailleur
|
26fec2f366
|
Enhance website
|
2020-03-11 12:53:41 +01:00 |
|
VESSILLER
|
898007f0b4
|
NEW add global reduction in cash desk
|
2020-03-11 12:30:07 +01:00 |
|
Florian Mortgat
|
ce01cf278d
|
FIX 10.0 - translations for "orders" not loaded in the homepage box
|
2020-03-11 11:45:57 +01:00 |
|
Florian Mortgat
|
6d1f62c1d9
|
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
|
2020-03-11 11:03:19 +01:00 |
|
Laurent Destailleur
|
c4b5a6f54b
|
CSS
|
2020-03-11 11:00:57 +01:00 |
|
VESSILLER
|
e4608a1ee5
|
FIX add only one product if no key code defined
|
2020-03-11 09:15:52 +01:00 |
|
Alexandre SPANGARO
|
f2b33c0d77
|
Fix accounting files link on auguria menu
|
2020-03-11 06:20:25 +01:00 |
|
Laurent Destailleur
|
1f5c8f682c
|
FIX cols parameter not propagated to tpl
|
2020-03-10 21:55:29 +01:00 |
|
Laurent Destailleur
|
d956222e36
|
FIX cols parameter not propagated to tpl
|
2020-03-10 21:54:50 +01:00 |
|
Laurent Destailleur
|
d6966dd429
|
Add method to count number of blogs in website
|
2020-03-10 15:59:48 +01:00 |
|
Laurent Destailleur
|
078112c649
|
Fix trans
|
2020-03-10 15:19:24 +01:00 |
|
atm-lena
|
35f32391a0
|
FIX - Clone Fourn Command, add line's extrafields
|
2020-03-10 14:46:15 +01:00 |
|
VESSILLER
|
8f768c6eca
|
NEW add a parameter to sort product by label in cash desk
|
2020-03-10 14:33:58 +01:00 |
|
VESSILLER
|
31e59bbe87
|
NEW add product if only one found
|
2020-03-10 14:18:39 +01:00 |
|
VESSILLER
|
cef2685368
|
NEW search on key code "enter" if defined in cash desk
|
2020-03-10 14:08:28 +01:00 |
|
VESSILLER
|
e2a918b9d2
|
FIX blank failure
|
2020-03-10 11:33:39 +01:00 |
|
VESSILLER
|
c707cef022
|
NEW add icon on payment buttons in cash desk
|
2020-03-10 11:20:15 +01:00 |
|
Tobias Sekan
|
60944c92a8
|
Fix error on add a line to a supplier order
|
2020-03-10 09:02:38 +01:00 |
|
florian HENRY
|
8d2ece83b7
|
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
|
2020-03-10 09:00:59 +01:00 |
|
florian HENRY
|
3d279094c1
|
fix PHP Fatal error: Uncaught Error: Call to undefined function newToken()
|
2020-03-10 09:00:51 +01:00 |
|
Laurent Destailleur
|
935aa4e71e
|
Fix export ebsite tool
|
2020-03-09 23:12:56 +01:00 |
|
Laurent Destailleur
|
cc1a02f0ea
|
Support of null values in graph
|
2020-03-09 22:52:30 +01:00 |
|
Laurent Destailleur
|
e1c7222172
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-09 20:39:05 +01:00 |
|
Laurent Destailleur
|
b1bb7de2fb
|
FIX CSRF error when creating an intervention
|
2020-03-09 20:19:28 +01:00 |
|
Laurent Destailleur
|
e66313d47e
|
FIX use bad var to check if total is positive for each VAT rate when
validating invoice.
|
2020-03-09 20:06:47 +01:00 |
|
Laurent Destailleur
|
b81c02de04
|
Fix home page after first page creation
|
2020-03-09 19:50:01 +01:00 |
|
Laurent Destailleur
|
a937fc8ef1
|
Fix home page after first page creation
|
2020-03-09 19:49:14 +01:00 |
|
Laurent Destailleur
|
99b1c773a7
|
FIX link when using anchor on "/"
|
2020-03-09 18:56:52 +01:00 |
|
Laurent Destailleur
|
86f6736a18
|
Fix phpcs
|
2020-03-09 18:55:47 +01:00 |
|
Laurent Destailleur
|
e536ee87b8
|
FIX link when using anchor on "/"
|
2020-03-09 18:54:34 +01:00 |
|
VESSILLER
|
07eda6a2c3
|
NEW categories and subcategories sorted by label (takepos)
|
2020-03-09 17:56:09 +01:00 |
|
VESSILLER
|
99d5b175c6
|
NEW no confirm discard ticket if paid
|
2020-03-09 17:40:32 +01:00 |
|
Laurent Destailleur
|
82f0d8a3bc
|
Fix bad params
|
2020-03-09 17:38:47 +01:00 |
|
Tim Otte
|
26deae9dbc
|
Fixed the regex string used to extract the attributes from the html tag
|
2020-03-09 15:37:23 +01:00 |
|
Laurent Destailleur
|
ca4c62be56
|
Fix var init
|
2020-03-09 13:56:25 +01:00 |
|
Tobias Sekan
|
9dd362a22c
|
NEW Category filter on bank list
|
2020-03-09 11:43:15 +01:00 |
|
Laurent Destailleur
|
788692f964
|
Trans
|
2020-03-09 09:19:47 +01:00 |
|
Laurent Destailleur
|
84606f29c0
|
Trans
|
2020-03-09 09:14:25 +01:00 |
|
Laurent Destailleur
|
6203e042b1
|
Trans
|
2020-03-09 09:10:06 +01:00 |
|
andreubisquerra
|
4d3e91fbc3
|
Black head bar with Colorfull TakePOS theme
|
2020-03-08 23:10:49 +01:00 |
|
andreubisquerra
|
5b7183efdd
|
Empty by default
|
2020-03-08 22:40:22 +01:00 |
|
jove@bisquerra.com
|
e71d312acd
|
Customer name on TakePOS headbar
|
2020-03-08 22:33:56 +01:00 |
|
Laurent Destailleur
|
1fb6d1d43d
|
FIX menu export document was not visible when using "simple accounting"
|
2020-03-08 20:49:50 +01:00 |
|
Laurent Destailleur
|
067759bf04
|
Fix graph for lines
|
2020-03-08 20:22:46 +01:00 |
|
Laurent Destailleur
|
3edc3dd382
|
Fix fields definition
|
2020-03-08 20:10:31 +01:00 |
|
Laurent Destailleur
|
343a80fd3d
|
Fix table fields
|
2020-03-08 19:25:00 +01:00 |
|
Laurent Destailleur
|
d9b0083923
|
Enhance modulebuilder
|
2020-03-08 18:28:31 +01:00 |
|
Laurent Destailleur
|
ff02b414cc
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-08 18:26:58 +01:00 |
|
Laurent Destailleur
|
fefb3fdde7
|
Fix permissions on restricArea for external modules
|
2020-03-08 18:26:41 +01:00 |
|
Laurent Destailleur
|
068f435146
|
Merge pull request #13302 from andreubisquerra/develop
Avoid higher payments than remain in TakePOS
|
2020-03-08 18:19:53 +01:00 |
|
Laurent Destailleur
|
f000d49bf1
|
Merge pull request #13301 from andreubisquerra/master
Remove unused variables in TakePOS
|
2020-03-08 18:18:51 +01:00 |
|
Laurent Destailleur
|
42d417d5d5
|
Trans
|
2020-03-08 16:32:00 +01:00 |
|
andreubisquerra
|
2af9904c04
|
Avoid higher payments than remain in TakePOS
|
2020-03-07 22:56:43 +01:00 |
|
jove@bisquerra.com
|
73f7c8958b
|
Remove unused variables in TakePOS
|
2020-03-07 22:07:20 +01:00 |
|
Laurent Destailleur
|
c4a429fb56
|
Merge pull request #13298 from jtraulle/patch-3
Fix Call to a member function getMessage() on null
|
2020-03-07 17:40:33 +01:00 |
|
Laurent Destailleur
|
26e0d63e31
|
Merge pull request #13297 from jtraulle/11.0
Fix #13296
|
2020-03-07 17:39:41 +01:00 |
|
Laurent Destailleur
|
148e2e58e5
|
Fix MAIN_SHOW_LOGO
|
2020-03-07 17:37:08 +01:00 |
|
Laurent Destailleur
|
119784fb3d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-07 17:34:01 +01:00 |
|
Laurent Destailleur
|
6424e50ba4
|
Enhance of colors in graph
|
2020-03-07 16:45:28 +01:00 |
|
Laurent Destailleur
|
44a611e006
|
Move getElementProperties and fetchObjectByElement into functions
|
2020-03-07 15:06:14 +01:00 |
|
Laurent Destailleur
|
e5bb6615b2
|
Fix remove warning
|
2020-03-06 20:06:56 +01:00 |
|
Laurent Destailleur
|
e6f68b9a29
|
Fix correct 'group by' when content is '0', '' or null
|
2020-03-06 20:02:05 +01:00 |
|
Jean Traullé
|
f7dda657b1
|
Fix Call to a member function getMessage() on null
Because we are not in the exception block, $e is necessarily undefined.
Thus replacing $e->getMessage(); by value of $paymentintent->status.
|
2020-03-06 17:46:45 +01:00 |
|
Jean Traullé
|
a6e3980acb
|
Update ihm.php
|
2020-03-06 17:35:03 +01:00 |
|
Jean Traullé
|
7c2bed2846
|
Fix #13296
|
2020-03-06 16:22:41 +00:00 |
|
Laurent Destailleur
|
d812249047
|
Move code into functions
|
2020-03-06 17:13:51 +01:00 |
|
Jean Traullé
|
ddf87e6d80
|
Fix param lost
Reported on https://www.dolibarr.fr/forum/t/v11-petites-regressions/32228
|
2020-03-06 16:13:09 +01:00 |
|
Laurent Destailleur
|
6b5707432d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-06 15:05:28 +01:00 |
|
Laurent Destailleur
|
cdec58a527
|
Clean old code
|
2020-03-06 15:05:18 +01:00 |
|
Laurent Destailleur
|
c545767e38
|
Fix @ before var
|
2020-03-06 14:58:41 +01:00 |
|
Laurent Destailleur
|
eeb219cb55
|
Revert "NEW sorting elements on project overview"
|
2020-03-06 14:52:29 +01:00 |
|
Laurent Destailleur
|
48661ad88e
|
Merge pull request #13290 from TobiasSekan/NewSortingForProjectOverview
NEW sorting elements on project overview
|
2020-03-06 14:44:48 +01:00 |
|
Laurent Destailleur
|
054ffb7547
|
Depreciate variables not used by Dolibarr.
|
2020-03-06 14:38:06 +01:00 |
|
Laurent Destailleur
|
d0f22c7bff
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
|
2020-03-06 14:22:42 +01:00 |
|
Laurent Destailleur
|
d4b67a6cef
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
|
2020-03-06 14:19:30 +01:00 |
|
Laurent Destailleur
|
aaf9aef5c8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/contrat/list.php
|
2020-03-06 14:17:21 +01:00 |
|
Laurent Destailleur
|
0b8adbfc55
|
Merge pull request #13289 from atm-greg/Fix_countable_warning_on_homescreen
fix countable warning on home screen
|
2020-03-06 14:13:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
4ab671338b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-06 13:11:44 +00:00 |
|
Laurent Destailleur
|
dc0e96a6e5
|
Fix scrutinizer
|
2020-03-06 14:09:00 +01:00 |
|
Laurent Destailleur
|
c4a9824685
|
Fix isMultiLang
|
2020-03-06 13:44:15 +01:00 |
|
Laurent Destailleur
|
adc996ee0a
|
FIX #13194
|
2020-03-06 13:19:17 +01:00 |
|
Laurent Destailleur
|
ad9d0a3472
|
Fix graph of product distribution when too much record
|
2020-03-06 12:45:02 +01:00 |
|
Tobias Sekan
|
eceaf5b321
|
Fix Travis CI error
|
2020-03-06 12:09:50 +01:00 |
|
Laurent Destailleur
|
5ff4b638a5
|
FIX empty of series in graph of product distribution
|
2020-03-06 12:00:40 +01:00 |
|
Laurent Destailleur
|
8e9d4e408f
|
FIX empty of series in graph of product distribution
|
2020-03-06 11:59:06 +01:00 |
|
Laurent Destailleur
|
e2396919d4
|
FIX chart of product distribution
|
2020-03-06 11:52:32 +01:00 |
|
Tobias Sekan
|
8c115a07b0
|
Fix lint errors
|
2020-03-06 11:49:49 +01:00 |
|
stickler-ci
|
03b8c86c06
|
Fixing style errors.
|
2020-03-06 10:45:35 +00:00 |
|
Tobias Sekan
|
acd7366d64
|
fix not working unlink
|
2020-03-06 11:33:42 +01:00 |
|
atm-greg
|
eafff58a54
|
fix countable warning
|
2020-03-06 11:30:45 +01:00 |
|
Tobias Sekan
|
3e58cc4c02
|
Fix build errors
|
2020-03-06 11:25:02 +01:00 |
|
Tobias Sekan
|
05e76ba122
|
Fix wrong merge (new MRP things was missing)
|
2020-03-06 10:21:34 +00:00 |
|
Laurent Destailleur
|
c27f90958e
|
Code comment
|
2020-03-06 11:06:07 +01:00 |
|
Laurent Destailleur
|
4c6a4ade5b
|
Log
|
2020-03-06 11:02:40 +01:00 |
|
Laurent Destailleur
|
722777d348
|
Add lib
|
2020-03-06 10:34:14 +01:00 |
|
Laurent Destailleur
|
47ebc2bbf2
|
Hide legend
|
2020-03-06 09:52:51 +01:00 |
|
ATM-Nicolas
|
a9d7bbc2ed
|
FIX : Remove unexisting link
|
2020-03-06 09:52:19 +01:00 |
|
Laurent Destailleur
|
ea658ebe72
|
Fix setShowLegend with chartjs
|
2020-03-06 09:51:30 +01:00 |
|
Laurent Destailleur
|
201f9badeb
|
elseif
|
2020-03-06 09:22:21 +01:00 |
|
Laurent Destailleur
|
f9546fc50e
|
Fix dolgraph
|
2020-03-06 09:21:04 +01:00 |
|
Laurent Destailleur
|
e8407e3f0b
|
Merge pull request #13283 from OPEN-DSI/10.0
FIX substitute lines dates values on doc generator (ODT, ...)
|
2020-03-06 09:19:50 +01:00 |
|
Laurent Destailleur
|
3f6cc8142d
|
Flag v12 alpha
|
2020-03-06 09:18:33 +01:00 |
|
Laurent Destailleur
|
32ee3122ac
|
More accurate code
|
2020-03-06 02:24:24 +01:00 |
|
Laurent Destailleur
|
fff7ee3e96
|
FIX #13285 SQL error during migration with pgsql
|
2020-03-06 01:55:36 +01:00 |
|
Laurent Destailleur
|
0ba2c53b02
|
Fix translation of graph
|
2020-03-06 01:42:42 +01:00 |
|
Laurent Destailleur
|
7b5f9e1b11
|
Fix graph
|
2020-03-06 01:29:59 +01:00 |
|
Laurent Destailleur
|
52c236570b
|
Work on the generic Graphic Reporting tool
|
2020-03-06 01:18:35 +01:00 |
|
Laurent Destailleur
|
92d6661483
|
Fix trans
|
2020-03-05 21:59:44 +01:00 |
|
Laurent Destailleur
|
0bd2740779
|
NEW Can force position of legend of graph on right (instead of top)
|
2020-03-05 17:23:19 +01:00 |
|
Laurent Destailleur
|
ddb26d7a8f
|
NEW Add graph type 'piesemicircle'
|
2020-03-05 16:30:55 +01:00 |
|
kamel
|
0123fa7696
|
FIX subsitute lines dates values on doc generator (ODT, ...)
|
2020-03-05 15:37:01 +01:00 |
|
Tobias Sekan
|
a155409bc2
|
Add sorting for project overview columns
|
2020-03-05 14:16:56 +01:00 |
|
Laurent Destailleur
|
2da459c561
|
Fix theme
|
2020-03-05 12:44:09 +01:00 |
|
Tim Otte
|
1472a24371
|
Added missing line break replacement when the values do not contain html tags
|
2020-03-05 09:41:22 +01:00 |
|
Laurent Destailleur
|
5a22fb11ef
|
css
|
2020-03-05 03:23:54 +01:00 |
|
Laurent Destailleur
|
85c1e2a670
|
Fix regression css
|
2020-03-05 03:20:06 +01:00 |
|
Laurent Destailleur
|
1a9506150e
|
NEW Can filter on donation status in list
|
2020-03-05 03:04:53 +01:00 |
|
Laurent Destailleur
|
fc31680bd0
|
Several fix for chart.js graphs
|
2020-03-05 02:55:06 +01:00 |
|
Laurent Destailleur
|
f35f0ecf9d
|
Look and feel v12
|
2020-03-05 01:54:12 +01:00 |
|
Laurent Destailleur
|
45bcd1c3bf
|
Code simpler
|
2020-03-05 01:50:53 +01:00 |
|
Laurent Destailleur
|
74fa8d90e7
|
Use status of member colors into pie chart
|
2020-03-05 01:38:41 +01:00 |
|
Laurent Destailleur
|
a98b65ad99
|
FIX #13274 cannot add or update 0 value for an int or double extrafield
type
|
2020-03-05 00:43:51 +01:00 |
|