lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

398 Commits

Author SHA1 Message Date
andreubisquerra
3715659880
Set to default place after close sale in TakePOS 
Set to default place after close sale in TakePOS when Bar Restaurant mode is enabled
 2022-03-06 12:27:59 +01:00
lvessiller
25497018c7 FIX group by qty in update line 2022-02-09 16:49:40 +01:00
lvessiller
44e9b13f30 NEW barcode rule to insert product in takepos 2022-02-09 16:37:41 +01:00
andreubisquerra
9d228b13de
FIX pay value 2022-01-28 17:22:41 +01:00
Laurent Destailleur
0d54f8df5f
Merge pull request #19847 from andreubisquerra/develop 
Create new line when add ordered product in TakePOS
 2022-01-25 14:29:07 +01:00
Laurent Destailleur
49f0e2f765
Merge pull request #19521 from altairis-melina/displaysku 
NEW : Show product reference in Takepos
 2022-01-19 02:32:51 +01:00
andreubisquerra
9cd4bfabff
Create new line when add ordered product in TakePOS 
When TAKEPOS_GROUP_SAME_PRODUCT is enabled in TakePOS and you add product, avoid group it if product is ordered
 2022-01-15 21:53:49 +01:00
Laurent Destailleur
f97ed1b3a3
Merge pull request #19623 from altairis-melina/changepriceht 
NEW : Add constant to change price HT in TakePos
 2022-01-10 21:07:41 +01:00
Mélina
81bee064af add getDolGlobalInt 2021-12-28 11:28:58 +01:00
Laurent Destailleur
0465afbc34 Fix css for takepos 2021-12-20 13:39:34 +01:00
Mélina
fca26827ec Add constant TAKEPOS_CHANGE_PRICE_HT 2021-12-15 10:47:30 +01:00
Laurent Destailleur
eb60e3c16d Fix click on "C" on pad, reset correctly pad edition. 2021-12-06 02:13:15 +01:00
stickler-ci
7c3b2f1e9b Fixing style errors. 2021-11-30 15:07:59 +00:00
Mélina
e43b95f05a Show reference product 2021-11-30 15:41:46 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
andreubisquerra
e98cfb3ef1
FIX Save TakePOS credit note as a pos sale 2021-11-11 18:02:56 +01:00
Laurent Destailleur
7d07da527d Debug v15 2021-11-01 03:30:22 +01:00
ptibogxiv
b322ae383b
Update invoice.php 2021-10-24 19:21:51 +02:00
ptibogxiv
68979578d9
Update invoice.php 2021-10-24 17:56:41 +02:00
ptibogxiv
10d35ee4aa
Fix excluded member display in takepos 2021-10-24 17:40:44 +02:00
andreubisquerra
5fe516770e
Supplements BUG 2021-10-23 16:59:25 +02:00
Laurent Destailleur
dc7143cb77
Merge pull request #18919 from OPEN-DSI/new-takepos-receipt-free-label 
NEW print without details
 2021-10-11 11:23:54 +02:00
andreubisquerra
be60293554
Travis fix 2021-10-10 08:58:17 +02:00
andreubisquerra
92756e1864
Improve public note 2021-10-09 23:48:35 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Dinclaux
807b4bf93e Fix cash payment in some cases. Make pay requests language independant and rely on payment method code. 2021-09-07 22:42:17 +11:00
Laurent Destailleur
f79b883a4a
Update invoice.php 2021-09-05 01:57:05 +02:00
Laurent Destailleur
7ca855d192
Update invoice.php 2021-09-02 21:14:01 +02:00
Gurvan Kervern
1061a9f9fe
Update invoice.php 2021-09-03 01:27:43 +08:00
stickler-ci
6417d3ddf7 Fixing style errors. 2021-08-29 14:48:25 +00:00
GurvanKervern
ebd1b49d2a Fix undef 4-1 
PHP8 warnings
 2021-08-29 22:41:22 +08:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
andreubisquerra
bae5b39706
Customer display on click product 2021-08-08 19:14:28 +02:00
Laurent Destailleur
0d9cf07035 Show ref of invoice into tooltip 2021-07-13 14:07:35 +02:00
Laurent Destailleur
1380344fdb Fix PHP 8 2021-07-08 12:17:32 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
61ed899608 Fix set discount on line in TakePos 2021-07-06 03:53:42 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
3f7f166fb6 Make option label easier to understand. 2021-04-27 19:33:11 +02:00
jove@bisquerra.com
712e1c4e7c NEW Edit sales lines rights in TakePOS 2021-04-17 01:06:30 +02:00
jove@bisquerra.com
db83428e89 Notes improvements 2021-04-14 00:15:02 +02:00
Laurent Destailleur
50635cea89 With a shopping-cart, it is clearer what is the hour in top bar menu 2021-03-29 14:03:19 +02:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
619df7bf23 Use internal linke 2021-03-14 17:18:04 +01:00
Frédéric FRANCE
ebfba19778
code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Nicolas
0c424db506 Correct stickler 2021-02-24 16:03:24 +01:00
Nicolas
589c757fbf Correct stickler 2021-02-24 15:57:33 +01:00
Nicolas
49c0967a3e NEW option for Takepos to show the total price without tax 2021-02-24 15:48:15 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
 2021-01-02 15:49:30 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
 2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79 FIX Dates of sales start in TakePOS 2020-12-30 21:43:04 +01:00
Laurent Destailleur
255b943b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-12-30 21:25:02 +01:00
Laurent Destailleur
1ec763fc14 FIX When creating a new POS sell, the creation date must be modified. 2020-12-30 21:22:54 +01:00
Laurent Destailleur
cad93fd585 Fix stock popup when line is not a predefined product on TakePOS 2020-12-07 22:26:08 +01:00
ptibogxiv
b3fe38d6bb
Fix list current ticket in takepos with multicompany 2020-12-06 14:20:16 +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
c215764627 Fix phpcs 2020-12-01 15:45:19 +01:00
Laurent Destailleur
3538e485a8 Fix phpunit 2020-12-01 11:38:46 +01:00
Laurent Destailleur
e689df8359 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/takepos/invoice.php
	htdocs/user/list.php
 2020-12-01 10:04:51 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
7870a33fd3
Update invoice.php 2020-11-30 15:39:35 +01:00
stickler-ci
9ee37153f7 Fixing style errors. 2020-11-30 10:32:58 +00:00
teleassist
560194c3b9
FIX #15374 : "New" doesn't clear total amounts 
Invoice's total amounts where not updated because of direct lines deleting in database.
 2020-11-30 11:22:49 +01:00
andreubisquerra
f6eadbbc3f
Order receipt improvements in TakePOS 2020-11-24 21:48:08 +01:00
lvessiller
8de5925f8b FIX remove LOG_ERR in syslog 2020-11-18 14:32:11 +01:00
lvessiller
3048a16b42 NEW log sale without lines as error in cash desk 2020-11-17 10:11:58 +01:00
andreubisquerra
5e7f1a545e
Fix travis 2020-11-12 22:50:46 +01:00
jove@bisquerra.com
a5ffac1935 Compatibility with new TakePOS connector 2020-11-12 22:31:32 +01:00
jove@bisquerra.com
43ced3c681 Credit note improvement in TakePOS 2020-11-10 21:45:15 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
javierybar
d23b6e145a
Fixes 2020-10-25 20:24:17 +01:00
javierybar
81ed97c9ba
NEW Credit invoice in TakePOS 2020-10-25 20:03:25 +01:00
ptibogxiv
7e8891bef9
NEW display date range if exist in takepos 
usefull for membership via POS (ie use in adherentsplus before pushing in core)
 2020-10-18 12:40:10 +02:00
Laurent Destailleur
69432284d0
Merge pull request #14999 from andreubisquerra/master 
NEW: Add third order printer to TakePOS
 2020-10-13 11:03:41 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
andreubisquerra
d80931429e
Fix travis 2020-10-12 22:34:05 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
1b92e03f47
Merge pull request #14921 from ptibogxiv/patch-383 
NEW set entity when creating invoice on takepos
 2020-10-08 19:30:37 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
bb39d7b205
Merge pull request #14916 from ptibogxiv/patch-382 
Fix  and save change of currency in invoice (takepos)
 2020-10-05 16:44:28 +02:00
Laurent Destailleur
44ecc15a07
Merge pull request #14915 from ptibogxiv/patch-380 
Fix reload display when invoice deleting in takepos
 2020-10-05 16:43:55 +02:00
Laurent Destailleur
0fdad1b63d
Merge pull request #14914 from ptibogxiv/patch-379 
Fix better display print/send button on takepos
 2020-10-05 16:43:11 +02:00
Laurent Destailleur
10d21eee03
Merge pull request #14911 from ptibogxiv/patch-376 
Fix display stock rights in takepos
 2020-10-05 16:42:31 +02:00
Laurent Destailleur
099c19cefb
Merge pull request #14912 from ptibogxiv/patch-378 
NEW multicurrency total in takepos
 2020-10-05 16:40:59 +02:00
Laurent Destailleur
243d576f83
Update invoice.php 
Log for debug
 2020-10-05 16:38:40 +02:00
andreubisquerra
1c34a7acda
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:50:27 +02:00
ptibogxiv
1a407e4c22
NEW set entity when creating invoice on takepos 
usefull for marketplace, coworking, multibranding shop
 2020-10-04 22:09:40 +02:00