Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 00:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,710 Commits 36 Branches 190 Tags
4b7de1e5f5cea42b5c70d38fe26d5e94adb51fda
Commit Graph

167 Commits

Author SHA1 Message Date
Laurent Destailleur
5f0f376817 Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product 
NEW add a parameter to group same product
 2020-03-20 10:45:06 +01:00
VESSILLER
0e171e81e6 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-freezone-vat-rate 2020-03-17 09:57:21 +01:00
VESSILLER
f7cf5f8784 NEW add VAT rates in free zone for product/service in cash desk 2020-03-17 09:44:59 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
01724894ad Fix useless BR 2020-03-16 18:33:06 +01:00
Laurent Destailleur
ffc861d4e2 FIX Autoadd product when barcode match 
Show barcode value in tooltips
 2020-03-16 18:04:22 +01:00
Laurent Destailleur
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
Laurent Destailleur
41ae8f6f68 TakePOS: Move all information of customer in the header 2020-03-16 13:27:10 +01:00
VESSILLER
1268bab958 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-13 17:27:04 +01:00
VESSILLER
04c0332bee FIX travis errors 2020-03-12 18:31:43 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
VESSILLER
e7056a9ade NEW add a parameter to group same product 2020-03-12 11:00:17 +01:00
Laurent Destailleur
54da1e73ff Option to show the n first line of desc into the basket 2020-03-11 23:56:48 +01:00
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
VESSILLER
5d740d16fb NEW set payment method on paid ticket in cash desk 2020-03-11 17:42:30 +01:00
VESSILLER
e95e182419 NEW only auto print paid ticket in cash desk 2020-03-11 16:53:27 +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
VESSILLER
898007f0b4 NEW add global reduction in cash desk 2020-03-11 12:30:07 +01:00
jove@bisquerra.com
e71d312acd Customer name on TakePOS headbar 2020-03-08 22:33:56 +01:00
andreubisquerra
2af9904c04 Avoid higher payments than remain in TakePOS 2020-03-07 22:56:43 +01:00
javierybar
a4b01e3025 Update invoice.php 2020-03-01 19:47:27 +01:00
Laurent Destailleur
1bc18931f8 Fix phpcs 2020-02-27 18:13:26 +01:00
Laurent Destailleur
2cfc62d753 Update invoice.php 2020-02-27 00:11:13 +01:00
javierybar
3fa55a59b7 New TAKEPOS_NUMBERING_PREFIX const 2020-02-26 22:45:32 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of 
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
 2020-02-23 22:49:03 +01:00
javierybar
fddcc844ff Add orders to Receipt Printers module 2020-02-22 11:30:48 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
javierybar
2942e85e47 More elegant and easy to understand printer setup 2020-02-20 15:16:17 +01:00
andreubisquerra
13ee716b78 Min. sell price updatereduction 2020-01-28 22:21:19 +01:00
andreubisquerra
691514be24 Min. sell price updateprice 2020-01-28 22:18:23 +01:00
Laurent Destailleur
d4223c3d82 TakePOS can use the same CSS properties than app 2020-01-27 02:06:34 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
andreubisquerra
acbd8efa7d NEW: Takepos supplements 2019-12-08 23:16:49 +01:00
Frédéric FRANCE
956ce9ea8f avoid placeid to be string or string[] 
Are you sure $placeid > 0 ? $placeid : 0 of type integer|string|string[] can be used in echo?
 2019-11-28 23:31:28 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
8793fdfe63 Fix not working feature 2019-11-07 15:25:57 +01:00
Laurent Destailleur
e671a119ce Merge branch 'develop' into patch-243 2019-11-07 15:12:37 +01:00
Frédéric FRANCE
b048a2b408 can print from takepos 2019-11-03 15:06:20 +01:00
Frédéric FRANCE
d797ea590e rework an experimental module 2019-11-03 00:50:58 +01:00
andreubisquerra
dbb5729f04 Default customer relative discount in TakePOS 2019-10-30 22:34:54 +01:00
stickler-ci
0e7f3c307e Fixing style errors. 2019-10-23 20:05:37 +00:00
ptibogxiv
6ff13ab7e1 Update invoice.php 2019-10-23 22:03:43 +02:00
Laurent Destailleur
6638b361d4 Update invoice.php 2019-10-22 12:44:19 +02:00
andreubisquerra
df181d1f35 Multiple payments in a TakePOS sale 2019-10-20 22:01:54 +02:00
Laurent Destailleur
05352a62e5 css 2019-10-20 15:37:20 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
e709c005a0 FIX Payment was not saved on TakePOS module. 2019-10-17 12:28:48 +02:00